refactor
Merge pull request #3 from phillwilt/refactor

refactor