Refactor
Merge pull request #22 from HenokA/refactor

Refactor