refactoring is hard
Merge pull request #21 from BlakeJenningsJohnson/refactoring

refactoring is hard
fixed conflicts with master