cleaned up some of the logging