Cleaned up the base work

This modifies some of the work based lessons learned from the PuppetCamp
DC presentation.