Speed up refactoring