Remove commented out code
Refactoring