Tidied up some logging inconsistencies