cleaning map code and refactored code as a group