Refactoring

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