[4.0] Whitespace Cleanup