Refactoring made