Some correct packaging and pylint corrections