Cleanup the code

Signed-off-by: Maximilian Marx <mmarx@wh2.tu-dresden.de>