A few minor style changes