Converted maps of lists to much more readable maps of maps