Reduced more pylint warnings