Nicer formatting

Refs #130 @ 5m