Apply styleguide bullet point advice

This section feels like it needs a little work; I'll come back to
that if no-one else does.