A couple of style and format changes