more pep 8 cleanup