Refactor ScanProcessor - not complete