Code structure made more generic

Removed list comprehensions
Island migration incorporated.