code refactoring

Change-Id: I07a09ce88ac37f28d5cfec6e839ffc6440a74a4e