Enumerables refactoring & comments