Refactoring of material-draws adjudication code