Refactor.  The sequel.