diff --git a/Makefile b/Makefile
index 7240b75..f2dc4ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 PROJECT = gitlab_submodule
 
+ISORT_ARGS = \
+	--project md_commons \
+	--known-local-folder gitlab_submodule
+
 lint:
 	flake8 $(PROJECT) --count --show-source --statistics
 	flake8 tests --count --show-source --statistics
@@ -11,6 +15,9 @@ test:
 	else nosetests -v --with-coverage --cover-package=$(PROJECT) tests; \
 	fi
 
+isort:
+	isort $(ISORT_ARGS) gitlab_submodule tests
+
 build_package:
 	rm -rf dist && \
 	python3 setup.py sdist && \
diff --git a/gitlab_submodule/__init__.py b/gitlab_submodule/__init__.py
index acb9e42..2c22ddd 100644
--- a/gitlab_submodule/__init__.py
+++ b/gitlab_submodule/__init__.py
@@ -12,12 +12,10 @@
     'iterate_subprojects', 'list_subprojects'
 ]
 
+from gitlab_submodule.gitlab_submodule import (iterate_submodules,
+                                               iterate_subprojects,
+                                               list_subprojects,
+                                               submodule_to_subproject)
 from gitlab_submodule.objects import Submodule, Subproject
-from gitlab_submodule.read_gitmodules import (
-    list_project_submodules as list_submodules)
-from gitlab_submodule.gitlab_submodule import (
-    iterate_submodules,
-    submodule_to_subproject,
-    iterate_subprojects,
-    list_subprojects,
-)
+from gitlab_submodule.read_gitmodules import \
+    list_project_submodules as list_submodules
diff --git a/gitlab_submodule/gitlab_submodule.py b/gitlab_submodule/gitlab_submodule.py
index 800ee97..772de60 100644
--- a/gitlab_submodule/gitlab_submodule.py
+++ b/gitlab_submodule/gitlab_submodule.py
@@ -1,13 +1,13 @@
-from typing import List, Optional, Generator, Union
+from typing import Generator, List, Optional, Union
 
 from gitlab import Gitlab
 from gitlab.v4.objects import Project, ProjectManager
 
 from gitlab_submodule.objects import Submodule, Subproject
-from gitlab_submodule.read_gitmodules import (
-    iterate_project_submodules as iterate_submodules)
-from gitlab_submodule.submodule_to_project import submodule_to_project
+from gitlab_submodule.read_gitmodules import \
+    iterate_project_submodules as iterate_submodules
 from gitlab_submodule.submodule_commit import get_submodule_commit
+from gitlab_submodule.submodule_to_project import submodule_to_project
 
 
 def _get_project_manager(
diff --git a/gitlab_submodule/objects.py b/gitlab_submodule/objects.py
index caf2245..bf0e459 100644
--- a/gitlab_submodule/objects.py
+++ b/gitlab_submodule/objects.py
@@ -1,4 +1,4 @@
-from typing import Union, Optional
+from typing import Optional, Union
 
 from gitlab.v4.objects import Project, ProjectCommit
 
diff --git a/gitlab_submodule/read_gitmodules.py b/gitlab_submodule/read_gitmodules.py
index f1c27a8..e1548fd 100644
--- a/gitlab_submodule/read_gitmodules.py
+++ b/gitlab_submodule/read_gitmodules.py
@@ -1,6 +1,5 @@
-from typing import List, Optional, Iterable, Tuple
-
 import re
+from typing import Iterable, List, Optional, Tuple
 
 from gitlab.v4.objects import Project
 
diff --git a/gitlab_submodule/submodule_commit.py b/gitlab_submodule/submodule_commit.py
index f50c69b..8a41ea6 100644
--- a/gitlab_submodule/submodule_commit.py
+++ b/gitlab_submodule/submodule_commit.py
@@ -1,13 +1,15 @@
-from typing import Optional, Union
-
 import logging
 import re
 from os import path
+from typing import Optional, Union
 
-from gitlab.v4.objects import Project, ProjectCommit
 from gitlab.exceptions import GitlabGetError
+from gitlab.v4.objects import Project, ProjectCommit
+
+from gitlab_submodule.objects import Commit, Submodule
 
-from gitlab_submodule.objects import Submodule, Commit
+
+logger = logging.getLogger(__name__)
 
 
 logger = logging.getLogger(__name__)
diff --git a/gitlab_submodule/submodule_to_project.py b/gitlab_submodule/submodule_to_project.py
index 99897c7..fde0c93 100644
--- a/gitlab_submodule/submodule_to_project.py
+++ b/gitlab_submodule/submodule_to_project.py
@@ -1,11 +1,10 @@
-from typing import Optional
 import logging
-
 from posixpath import join, normpath
-from giturlparse import parse, GitUrlParsed
+from typing import Optional
 
-from gitlab.v4.objects import Project, ProjectManager
 from gitlab.exceptions import GitlabGetError
+from gitlab.v4.objects import Project, ProjectManager
+from giturlparse import GitUrlParsed, parse
 
 from gitlab_submodule.objects import Submodule
 from gitlab_submodule.string_utils import lstrip, rstrip
diff --git a/tests/test_gitlab_submodule.py b/tests/test_gitlab_submodule.py
index 98c60e4..3b91041 100644
--- a/tests/test_gitlab_submodule.py
+++ b/tests/test_gitlab_submodule.py
@@ -2,10 +2,10 @@
 
 from gitlab import Gitlab
 
-from gitlab_submodule.objects import Subproject
 from gitlab_submodule.gitlab_submodule import (iterate_submodules,
-                                               submodule_to_subproject,
-                                               list_subprojects)
+                                               list_subprojects,
+                                               submodule_to_subproject)
+from gitlab_submodule.objects import Subproject
 
 
 class TestGitlabSubmodule(unittest.TestCase):
diff --git a/tests/test_submodule_commit.py b/tests/test_submodule_commit.py
index fcfb4e6..e6d86dd 100644
--- a/tests/test_submodule_commit.py
+++ b/tests/test_submodule_commit.py
@@ -6,9 +6,9 @@
 from gitlab.v4.objects import ProjectCommit
 
 from gitlab_submodule.read_gitmodules import list_project_submodules
+from gitlab_submodule.submodule_commit import (_get_submodule_commit_id,
+                                               get_submodule_commit)
 from gitlab_submodule.submodule_to_project import submodule_to_project
-from gitlab_submodule.submodule_commit import (get_submodule_commit,
-                                               _get_submodule_commit_id)
 
 
 class TestSubmoduleCommit(unittest.TestCase):