DIQ-76 slight refactor of parameter verification