Formatting and ordering tweaks