added space around map and remove some commented code