Sorted some pylint complains