Fixed up remaining pylint errors