little cleanup plus msftidy compliant

Making msftidy compliant plus minor cleanup, please feel free to review and check, if works and you agree the modifications, just send us pcap for verificaiton of this last version, land (merge) it into your repo, and the original pull request will be automatically updated and ready to merge I think.

References: https://github.com/rapid7/metasploit-framework/pull/1437