Refactoring, #4