[SI-1022] adjustments due to code review

Signed-off-by: Holger Rudolph <holger.rudolph@pta.de>
5 files changed