Code refactored and unused iterator removed.
Code refactor and some ajustments. Jar rebuilt.