Make repartitioner interface consistent + cleanup