Code Cleanup

Mostly formatting changes