Misc formatting cleanup