Fast refactoring