Cleaned up some whitespace and comments