made named functions more consistent