Refactor. Do the right thing every step of the way.