Cleaned up some of the formatting and comments