Some more pylint related improvements