Some simplifications, and pep8
Shorter messages
Pep8