Cleaned up logging to help with development.