fixup refactor of map updating methods