A few cosmetic changes to match pylint warnings