refactoring comment section