Refactor - Abstract away the update of map
Refactor - remove useless progn