Whitespace overhaul