a little cleanup of the scan interface