contractorClaim refactored
invoice refactoring