Waxman to run House Energy and Commerce Committee