small refactoring

Change-Id: If3c3ca082f218d290bb7c466a80a044370f15668
Signed-off-by: Alexander Wert <alexander.wert@sap.com>