minor refactoring on JH2