Formatting, small type tweaks