1 files changed, 7 insertions, 15 deletions

diff --git a/src/bootstrap/main.c b/src/bootstrap/main.c
index 2d24f92..cfad9f1 100755
--- a/src/bootstrap/main.c
+++ b/src/bootstrap/main.c
@@ -6,25 +6,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "string_view.c"
-#include "read_line.c"
+#include "singletons.c"
+
+#include "environment.c"
 #include "errors.c"
+#include "gc.c"
 #include "lexer.c"
 #include "objects.c"
 #include "parser.c"
-#include "environment.c"
-#include "gc.c"
 #include "primitives.c"
-
-//
-// Utility macros.
-//
-
-#define MAKE_SYM(STR) make_symbol((StringView){(STR), sizeof(STR) - 1})
-#define MAKE_ENV_VAR(ENV,STR,VAR) \
-    (env_add_symbol((ENV), MAKE_SYM(STR), (VAR)))
-#define MAKE_ENV_PROC(ENV,STR,FUN) \
-    (env_add_symbol((ENV), MAKE_SYM(STR), make_procedure(FUN)))
+#include "read_line.c"
+#include "string_view.c"
 
 void
 init(void) {
@@ -113,7 +105,7 @@ process_source(const StringView *source) {
         .current = 0,
     };
     while (has_next_token(&visitor) && peek_token(&visitor).type != TOKEN_EOF) {
-        // check the stack before parsing
+        // Check the root node stack size before parsing
         size_t root_stack_size = gc.roots.size;
         Object *root = parse_tree(&visitor);
         gc.roots.size = root_stack_size;