Cleaned up some of the configuration and formatting.