Cleanup logging messages a bit