diff --git a/kaybe/src/main/java/com/jmonad/kaybe/Just.kt b/kaybe/src/main/java/com/jmonad/kaybe/Just.kt
index 02e5a21..a653b80 100644
--- a/kaybe/src/main/java/com/jmonad/kaybe/Just.kt
+++ b/kaybe/src/main/java/com/jmonad/kaybe/Just.kt
@@ -2,7 +2,7 @@ package com.jmonad.kaybe
 
 class Just<A>(value : A) : IMaybe<A> {
   val value = value
-  override fun <B> bind(fn: (a : A) -> B): IMaybe<B> = Maybe().maybe(fn(value))
+  override fun <B> bind(fn: (a : A) -> B): IMaybe<B> = maybe(fn(value))
   override fun fromJust(): A = value
   override fun fromMaybe(def: A) = value
   override fun isJust() = true
diff --git a/kaybe/src/main/java/com/jmonad/kaybe/Maybe.kt b/kaybe/src/main/java/com/jmonad/kaybe/Maybe.kt
index ba7e6a7..40337ce 100644
--- a/kaybe/src/main/java/com/jmonad/kaybe/Maybe.kt
+++ b/kaybe/src/main/java/com/jmonad/kaybe/Maybe.kt
@@ -1,6 +1,4 @@
 package com.jmonad.kaybe
 
-class Maybe {
-  fun <T> maybe(value : IMaybe<T>) : IMaybe<T> = value
-  fun <T> maybe(value : T) = if (value == null) Nothing<T>() else Just(value)
-}
\ No newline at end of file
+fun <T> maybe(value : IMaybe<T>) : IMaybe<T> = value
+fun <T> maybe(value : T) = if (value == null) Nothing<T>() else Just(value)
diff --git a/kaybe/src/test/java/com/jmonad/kaybe/MaybeTest.kt b/kaybe/src/test/java/com/jmonad/kaybe/MaybeTest.kt
index da81e37..f24aeba 100644
--- a/kaybe/src/test/java/com/jmonad/kaybe/MaybeTest.kt
+++ b/kaybe/src/test/java/com/jmonad/kaybe/MaybeTest.kt
@@ -1,13 +1,11 @@
 package com.jmonad.kaybe
 
 import org.junit.Test
-import org.junit.Assert.assertEquals
-import com.jmonad.kaybe.Maybe
 
 class MaybeTest {
 
   @Test fun testSample() {
-//    assert maybe("sample").fromMaybe("").equals("sample");
+     maybe(1).bind {  }
   }
 
 }
\ No newline at end of file