Refactor map converter