refactor makeitmodular verification