Now returns a dictionary.
Follows pep8.
CLI