Refactoring4