Cleaning up the logging a bit more