Another attempt to fix things to match pylint