PAHMA979: minor refactoring