removed whitespace and commented code