refactor jiji spec.