Fixing some pylint issues