improves names of variables and code cleanup
Merge pull request #2 from kamalpreetgrewal/master

improves names of variables and code cleanup