More comments refactoring