Misc formatting/style fixes