[3.2] Whitespace Cleanup