refactoring

Change-Id: I588bbd80ffa6f6e688e0a863f14102bb9df56561