removed commented code and fixed idents