pep8 updates Dereno thru Garrison + do-overs