Pylint Fixes