Refactoring and clean up.  All tests green. Fitnesse green.