Refactor the claim module