Removed commented out code
Removed whitespace and various other formatting changes