some optimizations

was passing extra element to Partition previously