Adding phi variables and CERN-style jet cleaning.