Not sure about this - could you explain the extra arguments here? Just by looking at it it seems you have moved some logic into the eachFile - possible making it more complex?