comment refactoring done