Clean up all the double blank lines and more

Per title