Remove some pylint errors/warnings