diff --git a/src/config.ts b/src/config.ts
index 21f21d3..848f993 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,3 +1,4 @@
+//Array of part names to omit from the BOM
 export const rejectedParts = [
   'TP1',
   'TP2',
@@ -19,3 +20,14 @@ export const rejectedParts = [
   'IN',
   'OUT',
 ];
+
+//Header titles for the table
+export const headers: string[] = ['Part', 'Value'];
+
+//Config object for csv library
+export const csvConfig = {
+  delimiter: `;`,
+  quote: '"',
+  ignoreEmpty: true,
+  includeColumns: /(Part|Value)/,
+};
diff --git a/src/csvToJSON.ts b/src/csvToJSON.ts
index 558f43b..974faf6 100644
--- a/src/csvToJSON.ts
+++ b/src/csvToJSON.ts
@@ -1,15 +1,7 @@
-import { CSVParseParam } from '../node_modules/csvtojson/v2/Parameters';
 import { isJunk } from './utils';
+import { csvConfig } from './config';
 const csv = require('csvtojson');
 
-//CSV Config for EAGLE BOM
-const csvConfig = {
-  delimiter: `;`,
-  quote: '"',
-  ignoreEmpty: true,
-  includeColumns: /(Part|Value)/,
-};
-
 export async function getBOM(csvBOM: string) {
   const rawBOM = await csv(csvConfig).fromString(csvBOM);
   const bom = rawBOM.filter((part: part) => !isJunk(part));
diff --git a/src/index.ts b/src/index.ts
index baddd87..05b1535 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,16 +1,13 @@
 //Modules
 import { getBOM } from './csvToJSON';
-import {
-  createTableBody,
-  createTableHeader,
-  htmlTable,
-  clearTable,
-} from './utils';
+import { PartsTable } from './table';
+import { headers } from './config';
 
 //DOM elements
 const input = document.getElementById('csvInput') as HTMLInputElement;
 const csvTextOutput = document.getElementById('csvText') as HTMLPreElement;
 const jsonTextOutput = document.getElementById('partsJSON') as HTMLPreElement;
+const htmlTable = document.getElementById('partsTable') as HTMLTableElement;
 
 let csvBOM: string;
 
@@ -37,22 +34,20 @@ function processCSV(fileReader: Event) {
   //JSON Object
   printJSONbom(csvString);
   //Table
-  clearTable();
   createTable();
 }
 
-//TODO
+//Print JSON
 async function printJSONbom(csvString: string) {
   const bomJSON = await getBOM(csvString);
-  // console.log(bomJSON);
   jsonTextOutput.innerText = JSON.stringify(bomJSON, null, 2);
-  return bomJSON;
 }
 
+//Construct table
 async function createTable() {
   const bomJSON = await getBOM(csvBOM);
-  createTableHeader();
-  createTableBody(htmlTable, bomJSON);
+  const partsTable = new PartsTable(htmlTable, headers, bomJSON);
+  partsTable.createTable();
 }
 
 //Add event listener
diff --git a/src/table.ts b/src/table.ts
index d8646a7..800aef4 100644
--- a/src/table.ts
+++ b/src/table.ts
@@ -38,4 +38,11 @@ export class PartsTable {
       partValue.appendChild(partValText);
     });
   }
+
+  //Create full table
+  public createTable(): void {
+    this.clearTable();
+    this.createTableHeader();
+    this.createTableBody();
+  }
 }
diff --git a/src/utils.ts b/src/utils.ts
index e96df79..8b27ad1 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,47 +1,10 @@
-import { rejectedParts } from './config';
+import { rejectedParts, headers } from './config';
 
 export function isJunk(element: part): boolean {
   // Returns true if element is in the rejected list
   return rejectedParts.includes(element.Part);
 }
 
-//Table functions
-export function clearTable() {
-  document.querySelector('table')!.innerHTML = '';
-}
-
-export const htmlTable = document.getElementById(
-  'partsTable',
-) as HTMLTableElement;
-const headers: string[] = ['Part', 'Value'];
-
-export function createTableHeader(): void {
-  const tHead = htmlTable.createTHead();
-  const hRow = tHead.insertRow();
-  //Populate headers with text
-  for (const header of headers) {
-    const th = document.createElement('th');
-    const headerText = document.createTextNode(header);
-    th.appendChild(headerText);
-    hRow.appendChild(th);
-  }
-}
-
-export function createTableBody(table: HTMLTableElement, parts: part[]) {
-  parts.map((component) => {
-    //Create a row
-    const tRow = table.insertRow();
-    //Insert part name
-    const partName = tRow.insertCell();
-    const partNameText = document.createTextNode(component.Part);
-    partName.appendChild(partNameText);
-    //Insert part value
-    const partValue = tRow.insertCell();
-    const partValText = document.createTextNode(component.Value);
-    partValue.appendChild(partValText);
-  });
-}
-
 // TODO
 /*