[CLEANUP] Further improve variable and method names.
Merge pull request #23 from oliverklee/cleanup/naming

[CLEANUP] Further improve variable and method names.