Removed commented out code and formatting