commit for refactor

Change-Id: Icc0812f73201470d8427369b6a14b3da31d604df
Signed-off-by: li levi <levi.li@sap.com>