Refactor/cleanup builtin types