Pep8 case names
Pep8 refactorings