Apply PEP8 to cli.py
Remove some refactoring stuff
Merge pull request #135 from mdxs/pep8_cli

Apply PEP8 to cli.py