refactoring

Change-Id: I73e3c995e374efc9e25da7b19ec6c74182b08598