Merge "Fix pep8 violations in util"