refactoring

Change-Id: Iab27d486d23f09ba9343068dce72cad208f7949b