miscellaneous style fixes