pep fixes to more readable code