Removed commented code and whitespace