Remove explicit folds, make more compatible with pep8.