Fix refactoring