Clustering and matching have been improved along the way. This opens the door for further optimizations while keeping the code readable.