Improve cli help text and formatting.
Cosmetic (pep8)