Refactoring of adjudication code