pep8 fixes for scaffolds