2 files changed, 6 insertions, 26 deletions
diff --git a/src/main/scala/org/perl8/test/package.scala b/src/main/scala/org/perl8/test/package.scala
index b18dc2f..d2b8373 100644
--- a/src/main/scala/org/perl8/test/package.scala
+++ b/src/main/scala/org/perl8/test/package.scala
@@ -8,35 +8,21 @@ package object test {
 
   sealed trait Plan {
     val plan:    Int
-    val skipAll: Boolean
-    val message: Option[String]
+    val skipAll: Option[String]
   }
 
   case class NumericPlan (plan: Int) extends Plan {
-    val skipAll = false
-    val message = None
+    val skipAll = None
   }
 
   case object NoPlan extends Plan {
     val plan    = 0
-    val skipAll = false
-    val message = None
+    val skipAll = None
   }
 
-  case class SkipAll (msg: String) extends Plan {
+  case class SkipAll (message: String) extends Plan {
     val plan    = 0
-    val skipAll = true
-    val message = Some(msg)
-  }
-
-  case object SkipAllNoMessage extends Plan {
-    val plan    = 0
-    val skipAll = true
-    val message = None
-  }
-
-  object SkipAll {
-    def apply () = SkipAllNoMessage
+    val skipAll = Some(message)
   }
 
   case class BailOutException (
diff --git a/src/main/scala/org/perl8/test/tap/Producer.scala b/src/main/scala/org/perl8/test/tap/Producer.scala
index 52c72c9..d432856 100644
--- a/src/main/scala/org/perl8/test/tap/Producer.scala
+++ b/src/main/scala/org/perl8/test/tap/Producer.scala
@@ -25,13 +25,7 @@ object Producer {
     message.split("\n").map(m => "# " + m).mkString("\n")
 
   def plan (plan: Plan): String =
-    if (plan.skipAll) {
-      val skip = "1..0 # SKIP"
-      plan.message.map(m => skip + " " + m).getOrElse(skip)
-    }
-    else {
-      "1.." + plan.plan
-    }
+    plan.skipAll.map(m => "1..0 # SKIP " + m).getOrElse("1.." + plan.plan)
 
   def bailOut: String =
     "Bail out!"