rm commented code
refactoring