HW 8 - refactoring

Prune, prune, prune.  One dumbness left.