Cleanup enumerable

Cleanup