diff --git a/src/Freya.Core/Core.fs b/src/Freya.Core/Core.fs
index 601cf7e..9081174 100644
--- a/src/Freya.Core/Core.fs
+++ b/src/Freya.Core/Core.fs
@@ -158,8 +158,8 @@ module Freya =
     let apply (m: Freya<'a>, f: Freya<'a -> 'b>) : Freya<'b> =
         fun s ->
             Job.bind (fun (f, s) ->
-                Job.bind (fun (a, s) ->
-                    Job.result (f a, s)) (m s)) (f s)
+                Job.map (fun (a, s) ->
+                    (f a, s)) (m s)) (f s)
 
     let bind (m: Freya<'a>, f: 'a -> Freya<'b>) : Freya<'b> =
         fun s ->
@@ -173,8 +173,7 @@ module Freya =
 
     let delay (f: unit -> Freya<'a>) : Freya<'a> =
         fun s ->
-            Job.bind (fun (a, s) ->
-                Job.result (a, s)) (f () s)
+            f () s
 
     let init (a: 'a) : Freya<'a> =
         fun s ->
@@ -185,8 +184,8 @@ module Freya =
 
     let map (m: Freya<'a>, f: 'a -> 'b) : Freya<'b> =
         fun s ->
-            Job.bind (fun (a, s) ->
-                Job.result (f a, s)) (m s)
+            Job.map (fun (a, s) ->
+                (f a, s)) (m s)
 
     let zero () : Freya<unit> =
         fun s ->
@@ -212,8 +211,7 @@ module Freya =
 
     let delay (f: unit -> Freya<'a>) : Freya<'a> =
         fun s ->
-            async.Bind (f () s, fun (a, s) ->
-                async.Return (a, s))
+            f () s
 
     let init (a: 'a) : Freya<'a> =
         fun s ->
@@ -252,14 +250,14 @@ module Freya =
 
     let fromAsync (a: 'a, f: 'a -> Async<'b>) : Freya<'b> =
         fun s ->
-            Job.bind (fun (b) ->
-                Job.result (b, s)) (Job.fromAsync (f a))
+            Job.map (fun b ->
+                (b, s)) (Job.fromAsync (f a))
 
     let map2 (f: 'a -> 'b -> 'c, m1: Freya<'a>, m2: Freya<'b>) : Freya<'c> =
         fun s ->
             Job.bind (fun (a, s) ->
-                Job.bind (fun (b, s)->
-                    Job.result (f a b, s)) (m2 s)) (m1 s)
+                Job.map (fun (b, s)->
+                    (f a b, s)) (m2 s)) (m1 s)
 
 #else
 
@@ -294,8 +292,8 @@ module Freya =
             | Some memo ->
                 Job.result (memo, s)
             | _ ->
-                Job.bind (fun (memo, s) ->
-                    Job.result (memo, Aether.Optic.set memo_ (Some memo) s)) (m s)
+                Job.map (fun (memo, s) ->
+                    (memo, Aether.Optic.set memo_ (Some memo) s)) (m s)
 
 #else