Refactor per Jeff's code smell
Refactored to more goodness
preparing for next time