Minor refactoring

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