Cleaned up collection mess to java.util.Iterable