Tidied up logging messages