fix
Refactor
Merge pull request #1 from mojn/refactor

Refactor