refactor
Merge pull request #4 from craigspaeth/master

Various refactors to clean up redundancy