Refactor|Partitioner: More readability improvements