Refactor Dotremap::Remap