Moved setting logic to ScannerSettings class

Minor code cleanup