clean and add class MapUtils