Clean code and add setDefaultMapLocation()