Jpsi code cleaning

Jpsi code cleaning