refactoring some unused comments