Some minor cleanups

1. Change map to keys
2. Remove overshadow
3. Remove var