More miscellaneous style updates