Un-eff the prototype test
Not using this
Cleanup variable names in Variable class
Support line numbers for variables in Files