Using for expressions instead of maps