Spacing clean up

In line with rules set at #323.