Remove blank lines and add some too