Improve funsets map function