Made some more conformance to pylint