Whitespace and code style fixes

I am anal. I am also sorry. Deal with it.