A few minor style tweaks