Some more formatting, fixups