a few code style changes