First make the change easy, then make the easy change. —Kent Beck