Made code better conform to pylint