Shuffle some whitespace around