cleaning up some of the logging stuff...