diff --git a/tools/astyle_client.py b/tools/astyle_client.py
index 526df5d59..bb4194338 100644
--- a/tools/astyle_client.py
+++ b/tools/astyle_client.py
@@ -1,8 +1,10 @@
-import os
+#!/usr/bin/env python3
+
 import socket
 import sys
 import time
 
+
 def receive_data(conn):
     data = ''
     for t in range(1000):
@@ -26,8 +28,9 @@ def astyle(server_address, code):
     sock.close()
     return None
 
+
 if __name__ == "__main__":
-    server_address = ('cppcheck.osuosl.org', 18000)
+    server_address = ('cppcheck1.osuosl.org', 18000)
 
     for filename in sorted(sys.argv[1:]):
         if not (filename.endswith('.cpp') or filename.endswith('.h')):
@@ -46,4 +49,3 @@ if __name__ == "__main__":
             f.close()
         else:
             print('Unchanged: ' + filename)
-
diff --git a/tools/astyle_server.py b/tools/astyle_server.py
index a7aa1b313..0a8f59276 100644
--- a/tools/astyle_server.py
+++ b/tools/astyle_server.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 
 import logging
 import socket
@@ -41,4 +42,3 @@ def server(port):
 
 if __name__ == "__main__":
     server(port=18000)
-