Refactor and clean
Merge pull request #9 from Daytron/master

Refactor and clean