More cosmetic fixes and cleanups