pep8 tweaks
Rename 'strategy' to 'plugin' in partitioning.py