Formatting tweaks; refs #7