Refactoring is working