Minor refactoring

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