fast refactor