Refactoring implemented.