* Refactoring comments