took out commented code and whitespace