Refactor
Convert builtin funcs to untyped funcs