Pep8

Multiple changes for readability and PEP 8