Cleaning up

* Private functions begin and end with a __
* 80 line shizzz
Merge pull request #9 from shrayas/clean-up

merged!