Cosmetic reformat of UM/CF map.
Merge pull request #841 from bjlittle/refactor_um_cf_map

Cosmetic reformat of UM/CF map.