Misc cleanups / reformats