removing commented code
more fancy refactoring