map extractor refactor code