Cleaning up

* Private functions begin and end with a __
* 80 line shizzz