Merge "Tidy up loggers"