refactor code

Change-Id: Ia2bc49ed8742d79000fd59f7e95fa9b957573c54
46 files changed