removed commented code and fixed small error