Code refactoring in adapt-scan

Change-Id: Ie20bd0b05bbf3128933f10787aade7b63c98b52a
5 files changed