diff --git a/docs/conf.py b/docs/conf.py
index 03ae832..db63f54 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,6 @@
 import editorconfig
 from editorconfig import __version__
 
-
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/editorconfig/__init__.py b/editorconfig/__init__.py
index 2574ce4..1f6535a 100644
--- a/editorconfig/__init__.py
+++ b/editorconfig/__init__.py
@@ -1,7 +1,7 @@
 """EditorConfig Python Core"""
 
-from editorconfig.versiontools import join_version
 from editorconfig.version import VERSION
+from editorconfig.versiontools import join_version
 
 __all__ = ['get_properties', 'EditorConfigError', 'exceptions']
 
@@ -14,5 +14,5 @@ def get_properties(filename):
     return handler.get_configurations()
 
 
-from editorconfig.handler import EditorConfigHandler
 from editorconfig.exceptions import *
+from editorconfig.handler import EditorConfigHandler
diff --git a/editorconfig/__main__.py b/editorconfig/__main__.py
index fc98b6f..0cae7c1 100644
--- a/editorconfig/__main__.py
+++ b/editorconfig/__main__.py
@@ -4,32 +4,31 @@
 
 """
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import getopt
 import sys
 
-from editorconfig import VERSION, __version__
-from editorconfig.compat import force_unicode
-from editorconfig.exceptions import ParsingError, PathError, VersionError
-from editorconfig.handler import EditorConfigHandler
-from editorconfig.versiontools import split_version
+from . import VERSION, __version__
+from .compat import force_unicode
+from .exceptions import ParsingError, PathError, VersionError
+from .handler import EditorConfigHandler
+from .versiontools import split_version
 
 
 def version():
-    print("EditorConfig Python Core Version %s" % __version__)
+    print("EditorConfig Python Core Version {}".format(__version__))
 
 
 def usage(command, error=False):
-    if error:
-        out = sys.stderr
-    else:
-        out = sys.stdout
-    out.write("%s [OPTIONS] FILENAME\n" % command)
-    out.write('-f                 '
-              'Specify conf filename other than ".editorconfig".\n')
-    out.write("-b                 "
-              "Specify version (used by devs to test compatibility).\n")
-    out.write("-h OR --help       Print this help message.\n")
-    out.write("-v OR --version    Display version information.\n")
+    out = sys.stderr if error else sys.stdout
+    print("{} [OPTIONS] FILENAME\n".format(command), file=out)
+    print("-f                 "
+          'Specify conf filename other than ".editorconfig".\n', file=out)
+    print("-b                 "
+          "Specify version (used by devs to test compatibility).\n", file=out)
+    print("-h OR --help       Print this help message.\n", file=out)
+    print("-v OR --version    Display version information.\n", file=out)
 
 
 def main():
@@ -57,9 +56,9 @@ def main():
         if option == '-b':
             version_tuple = split_version(arg)
             if version_tuple is None:
-                sys.exit("Invalid version number: %s" % arg)
+                sys.exit("Invalid version number: {}".format(arg))
 
-    if len(args) < 1:
+    if not args:
         usage(command_name, error=True)
         sys.exit(2)
     filenames = args
@@ -73,9 +72,9 @@ def main():
             print(str(e))
             sys.exit(2)
         if multiple_files:
-            print("[%s]" % filename)
+            print("[{}]".format(filename))
         for key, value in options.items():
-            print("%s=%s" % (key, value))
+            print("{}={}".format(key, value))
 
 
 if __name__ == "__main__":
diff --git a/editorconfig/compat.py b/editorconfig/compat.py
index 4b9f8ca..3b87541 100644
--- a/editorconfig/compat.py
+++ b/editorconfig/compat.py
@@ -1,8 +1,7 @@
 """EditorConfig Python2/Python3 compatibility utilities"""
 import sys
 
-
-__all__ = ['force_unicode', 'u']
+__all__ = ['force_unicode']
 
 
 if sys.version_info[0] == 2:
@@ -15,10 +14,3 @@ def force_unicode(string):
     if not isinstance(string, text_type):
         string = text_type(string, encoding='utf-8')
     return string
-
-
-if sys.version_info[0] == 2:
-    import codecs
-    u = lambda s: codecs.unicode_escape_decode(s)[0]
-else:
-    u = lambda s: s
diff --git a/editorconfig/fnmatch.py b/editorconfig/fnmatch.py
index 1a7880b..8c3700d 100644
--- a/editorconfig/fnmatch.py
+++ b/editorconfig/fnmatch.py
@@ -20,7 +20,6 @@
 import os
 import re
 
-
 __all__ = ["fnmatch", "fnmatchcase", "translate"]
 
 _cache = {}
diff --git a/editorconfig/handler.py b/editorconfig/handler.py
index 1c33c02..ae899ae 100644
--- a/editorconfig/handler.py
+++ b/editorconfig/handler.py
@@ -7,12 +7,13 @@
 
 """
 
-import os
+from __future__ import absolute_import, print_function, unicode_literals
 
-from editorconfig import VERSION
-from editorconfig.exceptions import PathError, VersionError
-from editorconfig.ini import EditorConfigParser
+import os
 
+from . import VERSION
+from .exceptions import PathError, VersionError
+from .ini import EditorConfigParser
 
 __all__ = ['EditorConfigHandler']
 
diff --git a/editorconfig/ini.py b/editorconfig/ini.py
index 92ffb13..a0ca7c9 100644
--- a/editorconfig/ini.py
+++ b/editorconfig/ini.py
@@ -13,6 +13,8 @@
 
 """
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import posixpath
 import re
 from codecs import open
@@ -20,10 +22,8 @@
 from os import sep
 from os.path import dirname, normpath
 
-from editorconfig.compat import u
-from editorconfig.exceptions import ParsingError
-from editorconfig.fnmatch import fnmatch
-
+from .exceptions import ParsingError
+from .fnmatch import fnmatch
 
 __all__ = ["ParsingError", "EditorConfigParser"]
 
@@ -122,7 +122,7 @@ def _read(self, fp, fpname):
             line = fp.readline()
             if not line:
                 break
-            if lineno == 0 and line.startswith(u('\ufeff')):
+            if lineno == 0 and line.startswith('\ufeff'):
                 line = line[1:]  # Strip UTF-8 BOM
             lineno = lineno + 1
             # comment or blank line?
diff --git a/editorconfig/versiontools.py b/editorconfig/versiontools.py
index 01744f8..bffac3e 100644
--- a/editorconfig/versiontools.py
+++ b/editorconfig/versiontools.py
@@ -7,7 +7,6 @@
 
 import re
 
-
 __all__ = ['join_version', 'split_version']
 
 
@@ -16,9 +15,9 @@
 
 def join_version(version_tuple):
     """Return a string representation of version from given VERSION tuple"""
-    version = "%s.%s.%s" % version_tuple[:3]
+    version = "{0}.{1}.{2}".format(*version_tuple)
     if version_tuple[3] != "final":
-        version += "-%s" % version_tuple[3]
+        version += "-{3}".format(*version_tuple)
     return version
 
 
diff --git a/setup.py b/setup.py
index 7b44c23..0d5442f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 import os
+
 from setuptools import setup
 
 # Read the version