Added better technique for builtins, also cleaned up the code a little