Next Round of Pylint fixes