Minor improvements to the previous commit

Change-Id: I54cd39fde09095e16cc1277d62b9ebb602ee6313
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>