Formatting Cleanup

Formatting and some clean up. Enjoy