wraps some long lines
Fix the if cleanup
Land jvazquez-r7/metasploit#15, @kernelsmith's module cleanup