More pylint fixes to added code