Code improvement
Merge pull request #1716 from juancarlospaco/fix/cliparser

Code improvement, PEP8