Updated cli according to pep8
Improved error messages