Modify file digester to remove some redundancy