refactor and cleanup
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #89 from atungare/dev

Refactor and cleanup