FIxed issue #88

This update fixes the concurrentmodificationexception which occurs when
user syncs from google and refreshes the UI.
Changes to use Iterator instead of enhanced for loop.
Refactor