[CLEANUP] Improve variable names and add @var annotations.
Merge pull request #48 from jjriv/cleanup/node-names

[CLEANUP] Improve variable names and add @var annotations.