Refactor JCPI