Refactor
Merge pull request #5 from willnet/refactor

Refactor