Clean up the logging a little bit