refactor
Merge pull request #107 from Trott/refactor

refactor