Misc code cleanup to scan.php
Merge branch 'master' of github.com:benronk/web-scan