Cleaned up some of the log statements