Refactor
Merge pull request #1 from thedillonb/master

Refactor