Fix up formatting a bit