cleaned up some logging