Cleaned up my mess with enumerable

Now looks better with a cartesion product