Tidy up logging messages