diff --git a/src/linker/lnk_symbol_table.c b/src/linker/lnk_symbol_table.c
index 6dd393c4..bf86be2c 100644
--- a/src/linker/lnk_symbol_table.c
+++ b/src/linker/lnk_symbol_table.c
@@ -5,9 +5,9 @@ internal LNK_Symbol *
 lnk_make_defined_symbol(Arena *arena, String8 name, struct LNK_Obj *obj, U32 symbol_idx)
 {
   LNK_Symbol *symbol = push_array(arena, LNK_Symbol, 1);
-  symbol->name = name;
-  symbol->type = LNK_Symbol_Defined;
-  symbol->u.defined.obj = obj;
+  symbol->name                 = name;
+  symbol->type                 = LNK_Symbol_Defined;
+  symbol->u.defined.obj        = obj;
   symbol->u.defined.symbol_idx = symbol_idx;
   return symbol;
 }
@@ -16,9 +16,9 @@ internal LNK_Symbol *
 lnk_make_lib_symbol(Arena *arena, String8 name, struct LNK_Lib *lib, U64 member_offset)
 {
   LNK_Symbol *symbol = push_array(arena, LNK_Symbol, 1);
-  symbol->name = name;
-  symbol->type = LNK_Symbol_Lib;
-  symbol->u.lib.lib = lib;
+  symbol->name                = name;
+  symbol->type                = LNK_Symbol_Lib;
+  symbol->u.lib.lib           = lib;
   symbol->u.lib.member_offset = member_offset;
   return symbol;
 }
@@ -27,8 +27,8 @@ internal LNK_Symbol *
 lnk_make_undefined_symbol(Arena *arena, String8 name, struct LNK_Obj *obj)
 {
   LNK_Symbol *symbol = push_array(arena, LNK_Symbol, 1);
-  symbol->name = name;
-  symbol->type = LNK_Symbol_Undefined;
+  symbol->name        = name;
+  symbol->type        = LNK_Symbol_Undefined;
   symbol->u.undef.obj = obj;
   return symbol;
 }
@@ -37,9 +37,9 @@ internal LNK_Symbol *
 lnk_make_import_symbol(Arena *arena, String8 name, String8 import_header)
 {
   LNK_Symbol *symbol = push_array(arena, LNK_Symbol, 1);
-  symbol->name = name;
-  symbol->type = LNK_Symbol_Import;
-  symbol->u.import.import_header = import_header;
+  symbol->name                = name;
+  symbol->type                = LNK_Symbol_Import;
+  symbol->u.imp.import_header = import_header;
   return symbol;
 }
 
@@ -472,9 +472,29 @@ lnk_symbol_table_init(TP_Arena *arena)
   return symtab;
 }
 
-internal LNK_Symbol *
-lnk_symbol_table_search_hash(LNK_SymbolTable *symtab, LNK_SymbolScope scope, U64 hash, String8 name)
+internal void
+lnk_symbol_table_push_(LNK_SymbolTable *symtab, Arena *arena, U64 worker_id, LNK_SymbolScope scope, U64 hash, LNK_Symbol *symbol)
 {
+  lnk_symbol_hash_trie_insert_or_replace(arena, &symtab->chunk_lists[scope][worker_id], &symtab->scopes[scope], hash, symbol);
+}
+
+internal void
+lnk_symbol_table_push(LNK_SymbolTable *symtab, LNK_Symbol *symbol)
+{
+  U64 hash = lnk_symbol_hash(symbol->name);
+  switch (symbol->type) {
+  case LNK_Symbol_Null: break;
+  case LNK_Symbol_Defined: { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Defined, hash, symbol); } break;
+  case LNK_Symbol_Import:  { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Import,  hash, symbol); } break;
+  case LNK_Symbol_Lib:     { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Lib,     hash, symbol); } break;
+  default: { InvalidPath; } break;
+  }
+}
+
+internal LNK_Symbol *
+lnk_symbol_table_search(LNK_SymbolTable *symtab, LNK_SymbolScope scope, String8 name)
+{
+  U64 hash = lnk_symbol_hash(name);
   LNK_SymbolHashTrie *trie = lnk_symbol_hash_trie_search(symtab->scopes[scope], hash, name);
   if (trie == 0) {
     String8 alt_name = {0};
@@ -486,20 +506,12 @@ lnk_symbol_table_search_hash(LNK_SymbolTable *symtab, LNK_SymbolScope scope, U64
   return trie ? trie->symbol : 0;
 }
 
-internal LNK_Symbol *
-lnk_symbol_table_search(LNK_SymbolTable *symtab, LNK_SymbolScope scope, String8 name)
-{
-  U64 hash = lnk_symbol_hash(name);
-  return lnk_symbol_table_search_hash(symtab, scope, hash, name);
-}
-
 internal LNK_Symbol *
 lnk_symbol_table_searchf(LNK_SymbolTable *symtab, LNK_SymbolScope scope, char *fmt, ...)
 {
   Temp scratch = scratch_begin(0, 0);
-  
-  va_list args;
-  va_start(args, fmt);
+ 
+  va_list args; va_start(args, fmt);
   String8 name = push_str8fv(scratch.arena, fmt, args);
   va_end(args);
   
@@ -509,41 +521,6 @@ lnk_symbol_table_searchf(LNK_SymbolTable *symtab, LNK_SymbolScope scope, char *f
   return symbol;
 }
 
-internal void
-lnk_symbol_table_push_(LNK_SymbolTable *symtab, Arena *arena, U64 worker_id, LNK_SymbolScope scope, U64 hash, LNK_Symbol *symbol)
-{
-  lnk_symbol_hash_trie_insert_or_replace(arena, &symtab->chunk_lists[scope][worker_id], &symtab->scopes[scope], hash, symbol);
-}
-
-internal void
-lnk_symbol_table_push_hash(LNK_SymbolTable *symtab, U64 hash, LNK_Symbol *symbol)
-{
-  switch (symbol->type) {
-  case LNK_Symbol_Null: break;
-  case LNK_Symbol_Defined: { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Defined, hash, symbol); } break;
-  case LNK_Symbol_Import:  { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Import,  hash, symbol); } break;
-  case LNK_Symbol_Lib:     { lnk_symbol_table_push_(symtab, symtab->arena->v[0], 0, LNK_SymbolScope_Lib,     hash, symbol); } break;
-  default: { InvalidPath; } break;
-  }
-}
-
-internal void
-lnk_symbol_table_push(LNK_SymbolTable *symtab, LNK_Symbol *symbol)
-{
-  U64 hash = lnk_symbol_hash(symbol->name);
-  lnk_symbol_table_push_hash(symtab, hash, symbol);
-}
-
-internal void
-lnk_symbol_table_remove(LNK_SymbolTable *symtab, LNK_SymbolScope scope, String8 name)
-{
-  U64                 hash = lnk_symbol_hash(name);
-  LNK_SymbolHashTrie *trie = lnk_symbol_hash_trie_search(symtab->scopes[scope], hash, name);
-  if (trie) {
-    lnk_symbol_hash_trie_remove(trie);
-  }
-}
-
 internal void
 lnk_symbol_table_push_alt_name(LNK_SymbolTable *symtab, LNK_Obj *obj, String8 from, String8 to)
 {
diff --git a/src/linker/lnk_symbol_table.h b/src/linker/lnk_symbol_table.h
index 80f11b3a..41d2c3c4 100644
--- a/src/linker/lnk_symbol_table.h
+++ b/src/linker/lnk_symbol_table.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// --- Symbol ------------------------------------------------------------------
+
 typedef enum 
 {
   LNK_Symbol_Null,
@@ -41,11 +43,13 @@ typedef struct LNK_Symbol
   union {
     LNK_SymbolDefined   defined;
     LNK_SymbolLib       lib;
-    LNK_SymbolImport    import;
+    LNK_SymbolImport    imp;
     LNK_SymbolUndefined undef;
   } u;
 } LNK_Symbol;
 
+// --- Symbol Containers -------------------------------------------------------
+
 typedef struct LNK_SymbolNode
 {
   struct LNK_SymbolNode *next;
@@ -71,13 +75,7 @@ typedef struct LNK_SymbolArray
   LNK_Symbol *v;
 } LNK_SymbolArray;
 
-typedef enum
-{
-  LNK_SymbolScope_Defined,
-  LNK_SymbolScope_Import,
-  LNK_SymbolScope_Lib,
-  LNK_SymbolScope_Count
-} LNK_SymbolScope;
+// --- Symbol Hash Trie --------------------------------------------------------
 
 typedef struct LNK_SymbolHashTrie
 {
@@ -101,6 +99,16 @@ typedef struct LNK_SymbolHashTrieChunkList
   LNK_SymbolHashTrieChunk *last;
 } LNK_SymbolHashTrieChunkList;
 
+// --- Symbol Table ------------------------------------------------------------
+
+typedef enum
+{
+  LNK_SymbolScope_Defined,
+  LNK_SymbolScope_Import,
+  LNK_SymbolScope_Lib,
+  LNK_SymbolScope_Count
+} LNK_SymbolScope;
+
 typedef struct LNK_SymbolTable
 {
   TP_Arena                    *arena;
@@ -116,7 +124,7 @@ internal LNK_Symbol * lnk_make_lib_symbol(Arena *arena, String8 name, struct LNK
 internal LNK_Symbol * lnk_make_undefined_symbol(Arena *arena, String8 name, struct LNK_Obj *obj);
 internal LNK_Symbol * lnk_make_import_symbol(Arena *arena, String8 name, String8 import_header);
 
-// --- Symbol List -------------------------------------------------------------
+// --- Symbol Containers ------------------------------------------------------
 
 internal void                lnk_symbol_list_push_node(LNK_SymbolList *list, LNK_SymbolNode *node);
 internal LNK_SymbolNode *    lnk_symbol_list_push(Arena *arena, LNK_SymbolList *list, LNK_Symbol *symbol);
@@ -133,22 +141,20 @@ internal void                 lnk_symbol_hash_trie_remove(LNK_SymbolHashTrie *tr
 
 // --- Symbol Table ------------------------------------------------------------
 
-internal U64  lnk_symbol_hash(String8 string);
+internal U64 lnk_symbol_hash(String8 string);
 
 internal LNK_SymbolTable * lnk_symbol_table_init(TP_Arena *arena);
-internal LNK_Symbol *      lnk_symbol_table_search_hash(LNK_SymbolTable *symtab, LNK_SymbolScope scope, U64 hash, String8 name);
+internal void              lnk_symbol_table_push(LNK_SymbolTable *symtab, LNK_Symbol *symbol);
 internal LNK_Symbol *      lnk_symbol_table_search(LNK_SymbolTable *symtab, LNK_SymbolScope scope, String8 name);
 internal LNK_Symbol *      lnk_symbol_table_searchf(LNK_SymbolTable *symtab, LNK_SymbolScope scope, char *fmt, ...);
-internal void              lnk_symbol_table_push_hash(LNK_SymbolTable *symtab, U64 hash, LNK_Symbol *symbol);
-internal void              lnk_symbol_table_push(LNK_SymbolTable *symtab, LNK_Symbol *symbol);
-internal void              lnk_symbol_table_remove(LNK_SymbolTable *symtab, LNK_SymbolScope scope, String8 name);
 
 internal void lnk_symbol_table_push_alt_name(LNK_SymbolTable *symtab, struct LNK_Obj *obj, String8 from, String8 to);
 
 // --- Symbol Contrib Helpers --------------------------------------------------
 
-internal ISectOff lnk_sc_from_symbol      (LNK_Symbol *symbol);
-internal U64      lnk_isect_from_symbol   (LNK_Symbol *symbol);
+internal ISectOff lnk_sc_from_symbol(LNK_Symbol *symbol);
+internal U64      lnk_isect_from_symbol(LNK_Symbol *symbol);
 internal U64      lnk_sect_off_from_symbol(LNK_Symbol *symbol);
 internal U64      lnk_virt_off_from_symbol(COFF_SectionHeader **section_table, LNK_Symbol *symbol);
 internal U64      lnk_file_off_from_symbol(COFF_SectionHeader **section_table, LNK_Symbol *symbol);
+