Change map usage to set comprehensions instead