Misc formatting fixes