Refactor
Refactor
Refactor
Refactor
Merge pull request #5 from Frege/dev/refactor

Refactor