Fixed curly braces, line endings, and removed commented out code