first module cleanup

Its a first cleanup of https://github.com/rapid7/metasploit-framework/pull/1410

Please review, feel free to ask anything, test and once you feel comfortable land the pull request on your repo, and the original pull will be updated automatically :)

Think I haven't any device to test, so be sute it's working after my mods pls! :)