Moving scanner functions into scan methods