[ticket/289] Fix some scrutinizer issues

B3P-289
[ticket/289] Add a few more minor scrutinizer fixes

B3P-289
[ticket/289] Split mod_version_check into separate methods

B3P-289
[ticket/289] Rename mod_version_check to just version_check

B3P-289
Merge pull request #290 from marc1706/ticket/289

[ticket/289] Fix some scrutinizer issues