Replaced all closures with the callable