refactor
Merge pull request #11 from javfindly/feature/refactor

refactor