diff --git a/src/linq/index.ts b/src/linq/index.ts
index 6b3bcbd..2d51401 100644
--- a/src/linq/index.ts
+++ b/src/linq/index.ts
@@ -1,9 +1,11 @@
-import { Linqable, extractSync } from './linqable'
+import { Linqable, extractSync, OrderedLinqable, ToMapArgs } from './linqable'
 import { Sequence } from './iterables/sequence'
 import { elementsSymbol, ElementsWrapper, isWrapper } from './element-wrapper'
-import { AsyncLinqable, extractAsync } from './linqableAsync'
+import { AsyncLinqable, extractAsync, OrderedLinqableAsync } from './linqableAsync'
 import { Unfold, UnfoldStep } from './iterables/unfold'
+import { LinqMap, LinqSet } from './collections'
 
+export type { Linqable, AsyncLinqable, OrderedLinqable, OrderedLinqableAsync, ToMapArgs, LinqMap, LinqSet }
 export type SyncSource<T> = Iterable<T> | (() => Generator<T>)
 export type AsyncSource<T> = AsyncIterable<T> | (() => AsyncGenerator<T>)
 
diff --git a/src/linq/linqable.ts b/src/linq/linqable.ts
index 82cfc21..26d140e 100644
--- a/src/linq/linqable.ts
+++ b/src/linq/linqable.ts
@@ -301,10 +301,10 @@ export class Linqable<TSource> implements Iterable<TSource>, ElementsWrapper<TSo
 
     let accumulated = seed
     if (typeof seed === 'undefined') {
-      let result = iterator.next()
+      const result = iterator.next()
       if (!result.done) {
         accumulated = result.value
-        let second = iterator.next()
+        const second = iterator.next()
         index++
         if (!second.done) {
           accumulated = accumulator(result.value, second.value, index++) as TResult
@@ -316,7 +316,7 @@ export class Linqable<TSource> implements Iterable<TSource>, ElementsWrapper<TSo
       accumulated = accumulator(accumulated, result.value, index++) as TResult
       result = iterator.next()
     }
-  return accumulated
+    return accumulated
   }
 
   scan<TResult = TSource>(accumulator: (accumulated: TResult, element: TSource, index: number) => TResult, seed?: TResult): Linqable<TResult> {
diff --git a/src/linq/linqableAsync.ts b/src/linq/linqableAsync.ts
index 8e297be..586f4f7 100644
--- a/src/linq/linqableAsync.ts
+++ b/src/linq/linqableAsync.ts
@@ -207,19 +207,19 @@ export class AsyncLinqable<TSource> implements AsyncIterable<TSource>, ElementsW
   /**
      * Orders elements based on a selector function.
      * @param {function} selector - A function or a selector used for comparing the elements.
-     * @returns {OrderedLinqable<TSource>} An iterable of the ordered elements.
+     * @returns {OrderedLinqableAsync<TSource>} An iterable of the ordered elements.
      */
-  orderBy(selector: (element: TSource) => number | string): OrderedLinqable<TSource> {
-    return new OrderedLinqable(Ordered.from(this.elements, selector, true))
+  orderBy(selector: (element: TSource) => number | string): OrderedLinqableAsync<TSource> {
+    return new OrderedLinqableAsync(Ordered.from(this.elements, selector, true))
   }
 
   /**
      * Orders elements based on a selector function in desceding order.
      * @param {function} selector - A function or a selector used for comparing the elements.
-     * @returns {OrderedLinqable<TSource>} An iterable of the ordered elements.
+     * @returns {OrderedLinqableAsync<TSource>} An iterable of the ordered elements.
      */
-  orderByDescending(selector: (element: TSource) => number | string): OrderedLinqable<TSource> {
-    return new OrderedLinqable(Ordered.from(this.elements, selector, false))
+  orderByDescending(selector: (element: TSource) => number | string): OrderedLinqableAsync<TSource> {
+    return new OrderedLinqableAsync(Ordered.from(this.elements, selector, false))
   }
 
   /**
@@ -278,10 +278,10 @@ export class AsyncLinqable<TSource> implements AsyncIterable<TSource>, ElementsW
 
     let accumulated = seed
     if (typeof seed === 'undefined') {
-      let result = await iterator.next()
+      const result = await iterator.next()
       if (!result.done) {
         accumulated = result.value
-        let second = await iterator.next()
+        const second = await iterator.next()
         index++
         if (!second.done) {
           accumulated = await accumulator(result.value, second.value, index++) as TResult
@@ -760,7 +760,7 @@ export class AsyncLinqable<TSource> implements AsyncIterable<TSource>, ElementsW
   }
 }
 
-export class OrderedLinqable<TSource> extends AsyncLinqable<TSource> {
+export class OrderedLinqableAsync<TSource> extends AsyncLinqable<TSource> {
   constructor(elements: Ordered<TSource>) {
     super(elements)
   }
@@ -769,7 +769,7 @@ export class OrderedLinqable<TSource> extends AsyncLinqable<TSource> {
    * Chains an additional ascending ordering based on the key returned by the selector function.
    * @param selector - A function which returns a key which will be used for comparisons.
    */
-  thenBy(this: OrderedLinqable<TSource>, selector: (element: TSource) => string | number): OrderedLinqable<TSource> {
+  thenBy(this: OrderedLinqableAsync<TSource>, selector: (element: TSource) => string | number): OrderedLinqableAsync<TSource> {
     return this.from(selector, true)
   }
 
@@ -777,17 +777,17 @@ export class OrderedLinqable<TSource> extends AsyncLinqable<TSource> {
     * Chains an additional descending ordering based on the key returned by the selector function.
     * @param selector - A function which returns a key which will be used for comparisons.
     */
-  thenByDescending(this: OrderedLinqable<TSource>, selector: (element: TSource) => string | number): OrderedLinqable<TSource> {
+  thenByDescending(this: OrderedLinqableAsync<TSource>, selector: (element: TSource) => string | number): OrderedLinqableAsync<TSource> {
     return this.from(selector, false)
   }
 
   toString(): string {
-    return OrderedLinqable.name
+    return OrderedLinqableAsync.name
   }
 
-  private from(selector: (element: TSource) => string | number, isAscending: boolean): OrderedLinqable<TSource> {
+  private from(selector: (element: TSource) => string | number, isAscending: boolean): OrderedLinqableAsync<TSource> {
     const ordered = this.elements as Ordered<TSource>
-    return new OrderedLinqable(ordered.from(selector, isAscending))
+    return new OrderedLinqableAsync(ordered.from(selector, isAscending))
   }
 }