more pep8 and migration