Refs #26 - style tweaks