refactoring in builtin