Small refactor for ContractFiles