Refactoring 6.