Improvement in code aesthetics.

We're not savages. Review by @xeno-by.