Retrofitted and refactored code.

Using Google Guava for even better simplification of Collections and
Stopwatch.
Removed redundant code too.