Simplify map-reduce