Clean up
* Removed some debug code
* Fixed up some formatting