Align map elements to improve readability
Remove commented reference code
Use core functions in the  third challenge