Trivial changes on the source code.

* Changed variable naming, according to comments
  on commit ad252f1
* Removed unused variables, according to comments
  on commit 727b0f7