changed maps to for comprehension