*) Refactoring.