misc code style fixes