fix more white spaces to comply with upstream (&gt;_&lt;)