Minor tidying & refactor

Change-Id: I9b79d9db565840838af5533f12a2228e5b7a3205
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
6 files changed