PAHMA979: minor refactoring of parameters, logging