Fixed non-imported log issue while there. For #2449
Further cleanup of docblocks and standardisation of repos.