adding iter, iteri, and cleaning up the enumerable  class