more reverseMap benchmark
refactoring