Attempt to better clean up output
Fix import statements in scanner.go