A few code style changes