Refactoring for, and with, velocity

Going slow to go fast really does work!