Fix pylint violations
Merge pull request #2540 from cpennington/fix-pylint-errors

Fix pylint violations