Start small, then scale the refactor