* Refactoring.