refactor and cleanup
Merge pull request #45 from atungare/dev

refactor and cleanup