Refactoring removing comments