Minor formatting and cleanup
Cleanups