Fixed remaining pylint errors