various minor code style fixes