Cleanup

Some commented lines and functions are removed. Added interface to get
map.