declaration edits, other efficiency improvements
Merge branch 'master' of github.com:jblakeman/hostcheck