the refactor is complete
Merge pull request #7 from bis12/real-refactor

the refactor is complete