a few code style fixes