Minor refactoring in JPASetupWizard