diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala b/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala
index 9c7b38c6cd..9654dbccda 100644
--- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala
+++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala
@@ -2,7 +2,6 @@ package org.bitcoins.core.protocol.script
 
 import org.bitcoins.core.crypto.{ECDigitalSignature, ECPublicKey}
 import org.bitcoins.core.protocol.NetworkElement
-import org.bitcoins.core.script.constant.ScriptToken
 import org.bitcoins.core.serializers.script.RawScriptWitnessParser
 import org.bitcoins.core.util.{BitcoinSUtil, Factory}
 
@@ -16,7 +15,7 @@ sealed trait ScriptWitness extends NetworkElement {
   /** The byte vectors that are placed on to the stack when evaluating a witness program */
   def stack : Seq[Seq[Byte]]
 
-  override def toString = stack.map(BitcoinSUtil.encodeHex(_)).toString
+  override def toString = "ScriptWitness(" + stack.map(BitcoinSUtil.encodeHex(_)).toString + ")"
 
   override def hex = RawScriptWitnessParser.write(this)
 }
diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala
index 0d2eee2c06..d00318e27f 100644
--- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala
+++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala
@@ -1,8 +1,8 @@
 package org.bitcoins.core.protocol.transaction
 
 import org.bitcoins.core.number.UInt32
+import org.bitcoins.core.protocol.NetworkElement
 import org.bitcoins.core.protocol.script.{ScriptPubKey, ScriptSignature}
-import org.bitcoins.core.protocol.{CompactSizeUInt, NetworkElement}
 import org.bitcoins.core.script.constant.ScriptToken
 import org.bitcoins.core.serializers.transaction.RawTransactionInputParser
 import org.bitcoins.core.util.Factory
diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala
index 2133c44c3a..1b34657482 100644
--- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala
+++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala
@@ -3,7 +3,7 @@ package org.bitcoins.core.protocol.transaction
 import org.bitcoins.core.protocol.NetworkElement
 import org.bitcoins.core.protocol.script.ScriptWitness
 import org.bitcoins.core.serializers.transaction.RawTransactionWitnessParser
-import org.bitcoins.core.util.{BitcoinSUtil, Factory}
+import org.bitcoins.core.util.BitcoinSUtil
 
 /**
   * Created by chris on 11/21/16.
diff --git a/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala b/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala
index 8df6dca30f..c0da528afa 100644
--- a/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala
+++ b/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala
@@ -1,6 +1,5 @@
 package org.bitcoins.core.script.interpreter
 
-import org.bitcoins.core.script.constant.ScriptToken
 import org.bitcoins.core.consensus.Consensus
 import org.bitcoins.core.crypto.{BaseTransactionSignatureComponent, WitnessV0TransactionSignatureComponent}
 import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits}
@@ -10,7 +9,7 @@ import org.bitcoins.core.protocol.transaction.{BaseTransaction, EmptyTransaction
 import org.bitcoins.core.script._
 import org.bitcoins.core.script.arithmetic._
 import org.bitcoins.core.script.bitwise._
-import org.bitcoins.core.script.constant._
+import org.bitcoins.core.script.constant.{ScriptToken, _}
 import org.bitcoins.core.script.control._
 import org.bitcoins.core.script.crypto._
 import org.bitcoins.core.script.flag._