Variable are now scoped
Remove some simple hashtable usage and update Todo