refactor
Merge pull request #104 from Trott/refactor

refactor