minor cleanups on jp