Remove the named function
Extract checking if value type if a number to helpers