Dry up code
Merge pull request #289 from charlierudolph/cr-dryUpCode

Dry up code