diff --git a/Makefile b/Makefile
index 1bed5b6..db7030c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,5 +19,5 @@ all:
 	gcc $(INCLUDE_PATH) -g -o cfe_ts_crc cfe_ts_crc.c
 
 clean:
-	rm cfe_ts_crc
+	rm -f cfe_ts_crc
 
diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c
index eff9ff2..b1ce445 100644
--- a/cfe_ts_crc.c
+++ b/cfe_ts_crc.c
@@ -42,12 +42,10 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
-
-
-#define CFE_ES_CRC_8   1  /**< \brief CRC ( 8 bit additive - returns 32 bit total) (Currently not implemented) */
-#define CFE_ES_CRC_16  2  /**< \brief CRC (16 bit additive - returns 32 bit total) */
-#define CFE_ES_CRC_32  3  /**< \brief CRC (32 bit additive - returns 32 bit total) (Currently not implemented) */
-#define CFE_ES_DEFAULT_CRC  CFE_ES_CRC_16  /**< \brief mission specific CRC type  */
+#include <stdlib.h>
+#include <unistd.h>
+#include "cfe_tbl_filedef.h"
+#include "cfe_fs.h"
 
 typedef unsigned char uint8;
 typedef unsigned short uint16;
@@ -177,7 +175,14 @@ int main( int argc, char **argv )
 		if (readSize != 100) done=1;	
 	}
 	/* print the size/CRC results */
-     printf("\nTable File Name:            %s\nTable Size:                 %d Bytes\nExpected TS Validation CRC: 0x%08X\n\n", argv[1], fileSize, fileCRC);
+    printf("\nTable File Name:            %s\nTable Size:                 %d Bytes\nExpected TS Validation CRC: 0x%08X\n\n", argv[1], fileSize, fileCRC);
+
+    /* Close file and check*/
+    if( close(fd) != 0 )
+    {
+        printf("\nerror: Cannot close file!\n");
+        exit(0);
+    }
 
-     return(fileCRC);
+    return(fileCRC);
 }