diff --git a/OMPython/ModelicaSystem.py b/OMPython/ModelicaSystem.py
index 7ac6711d7..b479a3c86 100644
--- a/OMPython/ModelicaSystem.py
+++ b/OMPython/ModelicaSystem.py
@@ -33,21 +33,21 @@
 """
 
 import csv
+from dataclasses import dataclass
+import importlib
 import logging
 import numbers
+import numpy as np
 import os
+import pathlib
 import platform
 import re
 import subprocess
 import tempfile
-import xml.etree.ElementTree as ET
-import numpy as np
-import importlib
-import pathlib
-from dataclasses import dataclass
 import textwrap
 from typing import Optional
 import warnings
+import xml.etree.ElementTree as ET
 
 from OMPython.OMCSession import OMCSessionZMQ, OMCSessionException
 
diff --git a/OMPython/OMCSession.py b/OMPython/OMCSession.py
index 2b2555f64..04615b9ed 100644
--- a/OMPython/OMCSession.py
+++ b/OMPython/OMCSession.py
@@ -34,14 +34,15 @@
  CONDITIONS OF OSMC-PL.
 """
 
-import shutil
 import getpass
-import logging
 import json
+import logging
 import os
 import pathlib
 import psutil
+import pyparsing
 import re
+import shutil
 import signal
 import subprocess
 import sys
@@ -49,9 +50,8 @@
 import time
 from typing import Optional
 import uuid
-import pyparsing
-import zmq
 import warnings
+import zmq
 
 # TODO: replace this with the new parser
 from OMPython.OMTypedParser import parseString as om_parser_typed
diff --git a/OMPython/__init__.py b/OMPython/__init__.py
index 53368a03b..ccb067def 100644
--- a/OMPython/__init__.py
+++ b/OMPython/__init__.py
@@ -36,17 +36,17 @@
  CONDITIONS OF OSMC-PL.
 """
 
-from OMPython.OMCSession import OMCSessionCmd, OMCSessionZMQ, OMCSessionException
-from OMPython.ModelicaSystem import ModelicaSystem, ModelicaSystemCmd, ModelicaSystemError, LinearizationResult
+from OMPython.ModelicaSystem import LinearizationResult, ModelicaSystem, ModelicaSystemCmd, ModelicaSystemError
+from OMPython.OMCSession import OMCSessionCmd, OMCSessionException, OMCSessionZMQ
 
 # global names imported if import 'from OMPython import *' is used
 __all__ = [
+    'LinearizationResult',
     'ModelicaSystem',
     'ModelicaSystemCmd',
     'ModelicaSystemError',
-    'LinearizationResult',
 
+    'OMCSessionCmd',
     'OMCSessionException',
     'OMCSessionZMQ',
-    'OMCSessionCmd',
 ]