Update changes, fix pep8