removed commented code and fixed another comment