point_map: code cleanup