Refactoring day 2
Merge pull request #3 from ccummings/wip

Refactoring day 2