Fixes linting error and python 2.6 compat
Minor style update for lint
minor refactor for python2.6 compat