comment refactoring and cleaning