Clean up the logging situation a little bit