Refactor
Merge pull request #2 from lucidmoon/refactor

Refactor