* making sure we work with a proper data structure.

* added test to verify functionality.

* removed unused variables.