remove unused comment, refactoring