refactor imports and fix oxo should exit once the scan has completed

refactor imports and fix oxo should exit once the scan has completed #1052