Make linters and pep8 happier