minor refactoring in H1