Clear up a few whitespace issues