fast refactoring