Fixed a bunch of formatting and comments - Kevin