Redo refactoring