Cleared up some logging