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

Refactor