Clear up formatting

Inspired by @shalako

CF Community Pair (@chou & @jfoley)