Cleaned up some logging