msfcli - Improved code