Minor refactoring

Change-Id: I4582f9924b303dfaa328cc404735efc3c8a356a7
Signed-off-by: Iliyan Velichkov <iliyan.velichkov@sap.com>