More whitespace uglyness