Tidy up

/cc @paulrobertlloyd

Some subjective stuff in here, let's have a discussion if you disagree! :smile: