PEP 8 plus rename of the python files