Some minor cleanups

1. Change map to keys
2. Remove overshadow
3. Remove var
Merge pull request #998 from vipulnsward/remove_map

Some minor cleanups