Misc formatting and spacing