Refactoring 1.