Some code refactoring. Fixed typo in map data json