Do final (minor) cleanup

Hi @mwulftange ,

This pull request just tries to clean https://github.com/rapid7/metasploit-framework/pull/2787 and let it ready to go!  Please feel free to check / discuss / test / verify any change, and once you feel comfortable with the thing, just land into your repo and the original https://github.com/rapid7/metasploit-framework/pull/2787 is ready to final test and hopefully landing! Have into account I can't test the module, hope I've not broken nothing! Thanks!