refactoring

Change-Id: I53c5fff73786cff62675e6295e619ff85473520f