diff --git a/benchmarks/Python_Primitives/CAN_BUS_tlc_exec.py b/benchmarks/Python_Primitives/CAN_BUS_tlc_exec.py
index 65589f2d0396bb00ad53dffe75f5158f064f91c9..58e89f0eac3318a1d6d978a7dd9cc6303af38d61 100644
--- a/benchmarks/Python_Primitives/CAN_BUS_tlc_exec.py
+++ b/benchmarks/Python_Primitives/CAN_BUS_tlc_exec.py
@@ -3,7 +3,6 @@ from btypes.BInteger import BInteger
 from CAN_BUS_tlc import CAN_BUS_tlc
 
 
-
 class CAN_BUS_tlc_exec:
 
     def __init__(self):
@@ -4572,5 +4571,5 @@ class CAN_BUS_tlc_exec:
 
 
 if __name__ == '__main__':
-    exec = CAN_BUS_tlc_exec()
-    exec.simulate()
+    can_exec = CAN_BUS_tlc_exec()
+    can_exec.simulate()
diff --git a/btypes_primitives/src/main/python_magicstack_immutable/btypes/BInteger.py b/btypes_primitives/src/main/python_magicstack_immutable/btypes/BInteger.py
index f45245e1e2c563d5a6a26c5a4de080783bc76407..2170a6368ba0ee1494ac7cfb69f0d6ba0c9c2f0f 100644
--- a/btypes_primitives/src/main/python_magicstack_immutable/btypes/BInteger.py
+++ b/btypes_primitives/src/main/python_magicstack_immutable/btypes/BInteger.py
@@ -1,11 +1,12 @@
 from btypes.BBoolean import *
 
+
 class BInteger:
 
     def __init__(self, value):
         self.__value = value
 
-    def __add__(self, other: 'BInteger') -> 'BInteger':
+    def __add__(self, other):
         if type(other) == str:
             return str(self) + other
         return BInteger(self.__value + other.__value)
diff --git a/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java b/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java
index 35af4d8d3e957dca95fb15f922596ba468cf7fa7..efec3dc70fb6927cb67dd469c9bb85cd8fbd18c3 100644
--- a/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java
+++ b/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java
@@ -141,14 +141,13 @@ public class MachineGenerator implements AbstractVisitor<String, Void> {
 		this.iterationConstructHandler = new IterationConstructHandler(currentGroup, this, nameHandler, typeGenerator, importGenerator);
 		this.deferredSetAnalyzer = new DeferredSetAnalyzer(Integer.parseInt(deferredSetSize));
 		this.infiniteSetGenerator = new InfiniteSetGenerator(currentGroup, this, nameHandler);
-
-        this.identifierGenerator = new IdentifierGenerator(currentGroup, this, nameHandler, parallelConstructHandler, declarationGenerator);
+		this.identifierGenerator = new IdentifierGenerator(currentGroup, this, nameHandler, parallelConstructHandler, declarationGenerator);
 		this.recordStructGenerator = new RecordStructGenerator(currentGroup, this, typeGenerator, importGenerator, nameHandler);
 		this.declarationGenerator = new DeclarationGenerator(currentGroup, this, typeGenerator, importGenerator, nameHandler, deferredSetAnalyzer);
 		this.expressionGenerator = new ExpressionGenerator(currentGroup, this, useBigInteger, minint, maxint, nameHandler, importGenerator,
 				declarationGenerator, identifierGenerator, typeGenerator, iterationConstructHandler, recordStructGenerator);
-        this.predicateGenerator = new PredicateGenerator(currentGroup, this, nameHandler, importGenerator, iterationConstructHandler, infiniteSetGenerator);
-        this.lambdaFunctionGenerator = new LambdaFunctionGenerator(currentGroup, expressionGenerator, predicateGenerator, typeGenerator, declarationGenerator);
+		this.predicateGenerator = new PredicateGenerator(currentGroup, this, nameHandler, importGenerator, iterationConstructHandler, infiniteSetGenerator);
+		this.lambdaFunctionGenerator = new LambdaFunctionGenerator(currentGroup, expressionGenerator, predicateGenerator, typeGenerator, declarationGenerator);
 		this.recordStructAnalyzer = new RecordStructAnalyzer(recordStructGenerator);
 		this.substitutionGenerator = new SubstitutionGenerator(currentGroup, this, nameHandler, typeGenerator,
 																expressionGenerator, predicateGenerator, identifierGenerator, iterationConstructHandler,