diff --git a/eopayment/dummy.py b/eopayment/dummy.py
index 90e0682..87a3c64 100644
--- a/eopayment/dummy.py
+++ b/eopayment/dummy.py
@@ -17,7 +17,6 @@
import logging
import uuid
import warnings
-
from urllib.parse import parse_qs, urlencode
from .common import ERROR, PAID, URL, WAITING, PaymentCommon, PaymentResponse, ResponseError, _, force_text
diff --git a/eopayment/keyware.py b/eopayment/keyware.py
index 7dd4420..8acf44e 100644
--- a/eopayment/keyware.py
+++ b/eopayment/keyware.py
@@ -14,9 +14,10 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-import requests
from urllib.parse import parse_qs, urljoin
+import requests
+
from .common import (
CANCELLED,
ERROR,
diff --git a/eopayment/mollie.py b/eopayment/mollie.py
index c162dac..db4a214 100644
--- a/eopayment/mollie.py
+++ b/eopayment/mollie.py
@@ -14,9 +14,10 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-import requests
from urllib.parse import parse_qs, urljoin
+import requests
+
from .common import (
ACCEPTED,
CANCELLED,
diff --git a/eopayment/ogone.py b/eopayment/ogone.py
index fbae582..6898581 100644
--- a/eopayment/ogone.py
+++ b/eopayment/ogone.py
@@ -17,7 +17,6 @@
import hashlib
import uuid
from decimal import ROUND_HALF_UP, Decimal
-
from urllib import parse as urlparse
from .common import (
diff --git a/eopayment/paybox.py b/eopayment/paybox.py
index 967b257..275f502 100644
--- a/eopayment/paybox.py
+++ b/eopayment/paybox.py
@@ -24,14 +24,14 @@ import re
import uuid
import warnings
from collections import OrderedDict
+from urllib import parse as urllib
+from urllib import parse as urlparse
import pytz
import requests
from Cryptodome.Hash import SHA
from Cryptodome.PublicKey import RSA
from Cryptodome.Signature import PKCS1_v1_5
-from urllib import parse as urllib
-from urllib import parse as urlparse
from . import cb
from .common import (
diff --git a/eopayment/payfip_ws.py b/eopayment/payfip_ws.py
index a3fe914..751cd88 100644
--- a/eopayment/payfip_ws.py
+++ b/eopayment/payfip_ws.py
@@ -24,12 +24,12 @@ import random
import re
import unicodedata
import xml.etree.ElementTree as ET
+from urllib.parse import parse_qs
import pytz
import requests
import zeep
import zeep.exceptions
-from urllib.parse import parse_qs
from .common import (
CANCELLED,
diff --git a/eopayment/saga.py b/eopayment/saga.py
index 4aa7e91..e700c11 100644
--- a/eopayment/saga.py
+++ b/eopayment/saga.py
@@ -16,11 +16,11 @@
import functools
+from urllib.parse import parse_qs, urljoin
import lxml.etree as ET
import zeep
import zeep.exceptions
-from urllib.parse import parse_qs, urljoin
from .common import (
CANCELLED,
diff --git a/eopayment/sips2.py b/eopayment/sips2.py
index 72ecdf2..90c3be4 100644
--- a/eopayment/sips2.py
+++ b/eopayment/sips2.py
@@ -21,10 +21,10 @@ import hmac
import json
import uuid
import warnings
+from urllib import parse as urlparse
import pytz
import requests
-from urllib import parse as urlparse
from .common import (
CANCELED,
diff --git a/eopayment/systempayv2.py b/eopayment/systempayv2.py
index ad67927..06d6078 100644
--- a/eopayment/systempayv2.py
+++ b/eopayment/systempayv2.py
@@ -22,9 +22,9 @@ import random
import re
import string
import warnings
+from urllib import parse as urlparse
import pytz
-from urllib import parse as urlparse
from .cb import translate_cb_error_code
from .common import (
diff --git a/eopayment/tipi.py b/eopayment/tipi.py
index b00ce25..beb2d15 100644
--- a/eopayment/tipi.py
+++ b/eopayment/tipi.py
@@ -20,9 +20,9 @@ import logging
import random
import re
import warnings
+from urllib.parse import parse_qs, urlencode
import pytz
-from urllib.parse import parse_qs, urlencode
from .common import CANCELLED, DENIED, ERROR, PAID, URL, PaymentCommon, PaymentResponse, ResponseError, _
diff --git a/tests/test_dummy.py b/tests/test_dummy.py
index 78f60b0..f045296 100644
--- a/tests/test_dummy.py
+++ b/tests/test_dummy.py
@@ -15,9 +15,9 @@
# along with this program. If not, see .
import datetime
+from urllib.parse import parse_qs, urlparse
import pytest
-from urllib.parse import parse_qs, urlparse
import eopayment
diff --git a/tests/test_ogone.py b/tests/test_ogone.py
index 413458f..9e62b85 100644
--- a/tests/test_ogone.py
+++ b/tests/test_ogone.py
@@ -14,10 +14,10 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
+from urllib import parse as urllib
from xml.etree import ElementTree as ET
import pytest
-from urllib import parse as urllib
import eopayment
import eopayment.ogone as ogone
diff --git a/tests/test_paybox.py b/tests/test_paybox.py
index abaafb1..ac87fd7 100644
--- a/tests/test_paybox.py
+++ b/tests/test_paybox.py
@@ -19,10 +19,10 @@ import base64
import codecs
from decimal import Decimal
from unittest import TestCase, mock
+from urllib import parse as urllib
from xml.etree import ElementTree as ET
import pytest
-from urllib import parse as urllib
import eopayment
import eopayment.paybox as paybox
diff --git a/tests/test_systempayv2.py b/tests/test_systempayv2.py
index d7a6cf4..04549c6 100644
--- a/tests/test_systempayv2.py
+++ b/tests/test_systempayv2.py
@@ -16,9 +16,9 @@
from datetime import datetime, timedelta
+from urllib import parse as urlparse
import pytest
-from urllib import parse as urlparse
import eopayment
from eopayment import ResponseError
diff --git a/tests/test_tipi.py b/tests/test_tipi.py
index 6289ce2..a66591d 100644
--- a/tests/test_tipi.py
+++ b/tests/test_tipi.py
@@ -16,10 +16,10 @@
import datetime
from decimal import Decimal
+from urllib.parse import parse_qs, urlparse
import pytest
import pytz
-from urllib.parse import parse_qs, urlparse
import eopayment
import eopayment.tipi