diff --git a/calculator/calculator.py b/calculator/calculator.py
index e1f6b00680b982c4487c2e742333adc78e9281ea..6099dce8beb8c5074f7f6e588ac0e77ddee32016 100644
--- a/calculator/calculator.py
+++ b/calculator/calculator.py
@@ -2,7 +2,7 @@
 This Calculator holds the logic for the calculator.
 """
 from calculator.operators import Operator, STANDARD_OPERATORS
-from calculator.expression import Token, Term, Expression, TermExpression, OperatorExpression
+from calculator.expression import Term, Expression, TermExpression, OperatorExpression
 
 
 class Calculator:
diff --git a/calculator/test_calculator.py b/calculator/test_calculator.py
index a54eb60482eb507012fae621cc1ee2af27e6087b..473c1d5f93ee3f767c15eba7d3730db4fd9ec74c 100644
--- a/calculator/test_calculator.py
+++ b/calculator/test_calculator.py
@@ -3,7 +3,7 @@ Test module for the calculator module.
 """
 import pytest
 from calculator.calculator import Calculator
-from calculator.operators import STANDARD_OPERATORS, Operator
+from calculator.operators import STANDARD_OPERATORS
 
 
 @pytest.fixture(scope="module", name="setup")
@@ -21,6 +21,9 @@ def fixture_setup():
 
 
 def test_tokenizer(setup):
+    """
+    Setup the test suite, by instantiating the calculator and the operators.
+    """
     plus, minus, times, divide, calc = setup
     assert calc.tokenize("1 + 2 + 4 / 2") == [1,plus,2,plus,4,divide,2]
     assert calc.tokenize("1 * 0 - 4 / 2") == [1,times,0,minus,4,divide,2]