GetEnumerator fixed - duplicate code removed