minor pylint fixes
more minor pylint fixes
fixed indentation for util.py