PEP 8 cleaning
More clean up