refactoring methods and editing comments;