Code cleanup

[stevejalim]

As we're now (via #100) doing more than one thing while we scan the site, we should clean up the code and make it more easily reusable, because it's likely we'll be adding a third, fourth, fifth type of check over time, too