simplify Map more