More formatting and cleanups