Cleaned up formatting and made minor enhancements.