Refactoring ScanList