Refactoring 3.