diff --git a/psasim/Makefile b/psasim/Makefile
index 5d1da01ed..88ea7091c 100644
--- a/psasim/Makefile
+++ b/psasim/Makefile
@@ -14,12 +14,12 @@ libpsaff.so:
 	$(CC) $(INCLUDE) $(CFLAGS) -c -fpic src/service.c -o server.o
 	$(CC) -shared -o libpsaff.so common.o client.o server.o
 
-ifeq ($(DEBUG),1) 
-  CFLAGS += -DDEBUG -g 
+ifeq ($(DEBUG),1)
+  CFLAGS += -DDEBUG -g
 endif
 
 clean:
-	rm -rf $(BUILDDIR) 
+	rm -rf $(BUILDDIR)
 	rm -f *.so *.o
 	rm -rf test/*dSYM
 	cd test && make clean
diff --git a/psasim/include/psa/client.h b/psasim/include/psa/client.h
index 1d635ba36..f32841aac 100644
--- a/psasim/include/psa/client.h
+++ b/psasim/include/psa/client.h
@@ -22,7 +22,7 @@ extern "C" {
 #define PSA_VERSION_NONE       (0)
 
 /* PSA response types */
-#define PSA_CONNECTION_REFUSED PSA_ERROR_CONNECTION_REFUSED 
+#define PSA_CONNECTION_REFUSED PSA_ERROR_CONNECTION_REFUSED
 #define PSA_CONNECTION_BUSY    PSA_ERROR_CONNECTION_BUSY
 #define PSA_DROP_CONNECTION    PSA_ERROR_PROGRAMMER_ERROR
 
diff --git a/psasim/test/Makefile b/psasim/test/Makefile
index 86e8a7f26..07d1586cd 100644
--- a/psasim/test/Makefile
+++ b/psasim/test/Makefile
@@ -2,11 +2,11 @@ INCLUDE := -I../include/ -I./psa_manifest
 
 .PHONY: all clean
 
-all: 
+all:
 	psa_autogen manifest.json
 	$(CC) psa_ff_bootstrap_TEST_PARTITION.c -lpsaff -o partition
 	$(CC) client.c -lpsaff -o client
 
 clean:
 	rm -rf psa_manifest
-	rm -f client partition psa_ff_bootstrap_TEST_PARTITION.c 
+	rm -f client partition psa_ff_bootstrap_TEST_PARTITION.c
diff --git a/psasim/test/manifest.json b/psasim/test/manifest.json
index 332f09b82..0ab83ef90 100644
--- a/psasim/test/manifest.json
+++ b/psasim/test/manifest.json
@@ -1,4 +1,4 @@
-{  
+{
    "psa_framework_version":1.0,
    "name":"TEST_PARTITION",
    "type":"PSA-ROT",
@@ -6,8 +6,8 @@
    "entry_point":"psa_sha256_main",
    "stack_size":"0x400",
    "heap_size":"0x100",
-   "services":[  
-      {  
+   "services":[
+      {
          "name":"PSA_SID_SHA256",
          "sid":"0x0000F000",
          "signal":"PSA_SHA256",
@@ -17,13 +17,13 @@
       }
    ],
    "irqs": [
-	{
-		"source": "SIGINT",
-		"signal": "SIGINT_SIG"
-	},
-	{
-		"source": "SIGTSTP",
-		"signal": "SIGSTP_SIG"
-	}
+        {
+                "source": "SIGINT",
+                "signal": "SIGINT_SIG"
+        },
+        {
+                "source": "SIGTSTP",
+                "signal": "SIGSTP_SIG"
+        }
    ]
 }
diff --git a/psasim/tools/psa_autogen b/psasim/tools/psa_autogen.py
similarity index 100%
rename from psasim/tools/psa_autogen
rename to psasim/tools/psa_autogen.py