Cleaned up some logging and formatting