Tidy up of logging messages