Cleanup filter methods and add some comments to ScannerCB