More tightening up language