diff --git a/tdir b/tdir
index 2cdf226..24f4405 100755
--- a/tdir
+++ b/tdir
@@ -1,7 +1,7 @@
-#!/usr//bin/env python2
+#!/usr//bin/env python
 """
 tdir - Display Formatted Directory Listings
-Copyright (c) 2001-2014 TundraWare Inc., All Rights Reserved.
+Copyright (c) 2001-2018 TundraWare Inc., All Rights Reserved.
 """
 
 # python Library Imports
@@ -94,7 +94,7 @@
         elif y != -1:                    # File has extension
             ext = x[y:]
             name =  x[:y]
-            if not ExtList.has_key(ext):
+            if ext not in ExtList:
                 ExtList[ext]= []
         else:                    # File has no extension
             ext = ""
@@ -131,15 +131,18 @@
     else:
         DIREND = "\n"
     sys.stdout.write(dir.replace("\\", "/") + DIREND)
-    if SHOWDIR or SHOWFILE :
-	sys.stdout.write("\n")
+
+    if SHOWDIR or SHOWFILE:
+        sys.stdout.write("\n")
+
     if len(DirList) > 0:
         DirList.sort()
         OutputColumns(DirList, True)
+
     if len(FileList) > 0:
         if SORTBYEXT:
             ExtList = OrderByExtension(FileList)
-            Ext = ExtList.keys()
+            Ext = list(ExtList.keys())
             Ext.sort()
             for x in Ext:
                 FileList = ExtList[x]
@@ -174,7 +177,7 @@
 def Usage():
     UsageInfo = (
                  ("tdir " + VERSION.split()[2] +
-                  " - Copyright (c) 2001-2014 TundraWare Inc., All Rights Reserved. \n", ""),
+                  " - Copyright (c) 2001-2018 TundraWare Inc., All Rights Reserved. \n", ""),
                  ("  usage: tdir [-DRdefhtv] [-c #] [-s c] [-w #] [dir...]  where,\n\n", ""),
                  ("-D",      "Do not display dot files\n"),
                  ("-R",      "Recurse down each named directory tree\n"),
diff --git a/tdir-license.txt b/tdir-license.txt
index 6b51362..2fb2a60 100644
--- a/tdir-license.txt
+++ b/tdir-license.txt
@@ -1,11 +1,11 @@
-tdir - Copyright (c) 2001-2014 TundraWare Inc., All Rights Reserved
+tdir - Copyright (c) 2001-2018 TundraWare Inc., All Rights Reserved
 
 Permission is hereby granted for the duplication and use of tdir so
 long as ALL the following conditions are met:
 
     1) The user of tdir understands and agrees that this is experimental
        software which is provided "AS-IS" with no warranties expressed
-       or implied by TundraWare Inc.  
+       or implied by TundraWare Inc.
 
      2) The user acknowledges tdir has NOT been tested for:
          a) Correct operation
diff --git a/tdir.1 b/tdir.1
index 222f0e4..a7c6cb3 100644
--- a/tdir.1
+++ b/tdir.1
@@ -5,7 +5,7 @@
 tdir [-DRdefhtv] [-c\fICol Width\fP] [-s\fISep Character\fP] [-w\fIOutput Width\fP] [dir ...]
 .SH DESCRIPTION
 tdir displays a formatted listing for the directories you select,
-grouping the file names by "extension".  If you do not name a 
+grouping the file names by "extension".  If you do not name a
 specific directory, it defaults to the current directory.
 
 For each directory selected, tdir will first display a columnated and
@@ -16,11 +16,11 @@
 If either a directory or file name cannot fit in the column width, it will
 be truncated so that it does fit.  In that case, the last character of
 the truncated name will be replaced with a carat (^) to let you know
-what happened. 
+what happened.
 
 The output is written to the standard output.
 
-Normal exits return an exit status of 0.  Command line errors or 
+Normal exits return an exit status of 0.  Command line errors or
 unreasonable parameters return an exit status of 2.
 
 .SH OPTIONS
@@ -64,7 +64,7 @@
 Set Column With to # characters. (default: 19)
 .TP
 .B -w #
-Set the Output Width to # characters. 
+Set the Output Width to # characters.
 On Unix-style systems, this defaults to the current terminal
 width minus 1.  On other systems it defaults to 80.
 .SH COLUMN ARITHMETIC
@@ -99,7 +99,7 @@
 Paths are displayed using '/' as the path separator.  I can't help it
 that Microsoft departed from The One True Way ;))
 .SH COPYRIGHT
-tdir is Copyright(c) 2001-2014 TundraWare Inc.
+tdir is Copyright(c) 2001-2018 TundraWare Inc.
 For terms of use, see the tdir-license.txt file in the program distribution.
 If you install tdir on a FreeBSD system using the 'ports' mechanism, you will
 also find this file in /usr/local/share/doc/tdir.
@@ -107,4 +107,3 @@
 .nf
 Tim Daneliuk
 tundra@tundraware.com
-