Minor refactoring to fixed code
Minor refactoring to fixed code

Emergensys/commandline,Thilas/commandline,huoxudong125/commandline,nausley/commandline,rmboggs/commandline,huoxudong125/commandline,anthonylangsworth/commandline,kshanafelt/commandline,nausley/commandline,kshanafelt/commandline,Ehryk/commandline,rmboggs/commandline,Ehryk/commandline,Emergensys/commandline,anthonylangsworth/commandline,Thilas/commandline