Fix: --extensive didn't work (scan was always extensive)
Fixing bad coding style