Add missing newlines

And remove some superfluous ones.