Replace overshadowed variables and remove overridden method
Merge pull request #28 from vipulnsward/remove_overshadows

Replace overshadowed variables and remove overridden method