More whitespace tweaks