Do minor cleanup

This pull request just makes minor cleanup in order to land https://github.com/rapid7/metasploit-framework/pull/3433 @TecR0c do you mind to review and land if feel comfortable? In this way your branch will be updated and https://github.com/rapid7/metasploit-framework/pull/3433 automatically updated with the changes too. Thanks!