More replacing of unnecessary Maps to lists