diff --git a/src/pyrmv/__init__.py b/src/pyrmv/__init__.py
index 8ecd27d..fe1ddca 100644
--- a/src/pyrmv/__init__.py
+++ b/src/pyrmv/__init__.py
@@ -25,6 +25,5 @@ __version__ = "0.3.6"
 __license__ = "MIT License"
 __author__ = "Profitroll"
 
-from . import const, enums, errors, raw, utility
-from .classes import *
-from .classes.Client import Client
+from . import classes, const, enums, errors, raw, utility
+from .classes.client import Client
diff --git a/src/pyrmv/classes/Client.py b/src/pyrmv/classes/Client.py
index 8676f76..ef103b0 100644
--- a/src/pyrmv/classes/Client.py
+++ b/src/pyrmv/classes/Client.py
@@ -1,16 +1,24 @@
 from datetime import datetime, timedelta
 from typing import List, OrderedDict, Union
 
-from pyrmv.classes import *
+from pyrmv.classes import (
+    BoardArrival,
+    BoardDeparture,
+    Journey,
+    Message,
+    Stop,
+    StopTrip,
+    Trip,
+)
 from pyrmv.enums import *
 from pyrmv.raw import board_arrival as raw_board_arrival
-from pyrmv.raw.board_departure import board_departure as raw_board_departure
-from pyrmv.raw.him_search import him_search as raw_him_search
-from pyrmv.raw.journey_detail import journey_detail as raw_journey_detail
-from pyrmv.raw.stop_by_coords import stop_by_coords as raw_stop_by_coords
-from pyrmv.raw.stop_by_name import stop_by_name as raw_stop_by_name
-from pyrmv.raw.trip_find import trip_find as raw_trip_find
-from pyrmv.raw.trip_recon import trip_recon as raw_trip_recon
+from pyrmv.raw import board_departure as raw_board_departure
+from pyrmv.raw import him_search as raw_him_search
+from pyrmv.raw import journey_detail as raw_journey_detail
+from pyrmv.raw import stop_by_coords as raw_stop_by_coords
+from pyrmv.raw import stop_by_name as raw_stop_by_name
+from pyrmv.raw import trip_find as raw_trip_find
+from pyrmv.raw import trip_recon as raw_trip_recon
 from pyrmv.utility import find_exception
 
 try:
diff --git a/src/pyrmv/classes/Ticket.py b/src/pyrmv/classes/Ticket.py
index 310f065..8fb79ab 100644
--- a/src/pyrmv/classes/Ticket.py
+++ b/src/pyrmv/classes/Ticket.py
@@ -1,4 +1,4 @@
-class Ticket():
+class Ticket:
     """
     {
         "externalContent": {
@@ -44,9 +44,9 @@ class Ticket():
                 "FreigabeId": "20730",
                 "Freigabe":"2645, 3670, 5001, 5002, 5003, 5004, 5005, 5006, 5011, 5013, 5015, 5021, 5022, 5023, 5031, 5041, 5042, 5046, 5059, 5100, 5233, 6239, 6626, 6636, 6637, 6639, 6648, 6649, 6650, 6655, 6660, 6664, 6691",
                 "FreigabeOverview": "Bad Homburg v.d.Höhe;Bad Soden a.Ts.;Eschborn;Friedrichsdorf;Glashütten"
-        }        
+        }
     }
     """
 
     def __init__(self) -> None:
-        pass
\ No newline at end of file
+        pass