More whitespace adjustments