Fix pylint violations from #2129
Merge pull request #2171 from cpennington/pylint-cleanup

Fix pylint violations from #2129