First pass refactor
Merge pull request #1 from rrgayhart/refactoring

First pass refactor