Refactoring works