White space improvements