Refactoring 2.