removed commented code, removed white space