Sivasish48: issue #16 changed some of the variable name and some scopes and some properties names.

[Sivasish48]

Variable in the repo does have quite good variable naming. So not so many changes are required.