Refactoring. Edit&Update comments