Clean up

This is much nicer to read than the previous version which used a `\`
for line continuation.