Tried to do some refactor.  Decided not to.