Clean up newline

There is a mess of newlines. I've started some work to clean this issue
up.