Small JPKSClient refactorization