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

refactor and cleanup