Initial streamlining of the j*pm modules