Code cleanups

Signed-off-by: Schellenberger <schellenberger@inb.uni-luebeck.de>