PJ: Fixed some operator and underscore _ formatting