Clean-up
EnumerableExtensions class including WithIndex extension method