A couple of code style changes