Multiple style tweaks. Refs #8