Code: Refactoring.