Make stratification modular
Make pylint happier