Whitespace management