A couple of style changes