Refactoring 6