refactor
Merge pull request #37 from Trott/refactor

refactor