few code style fixes