diff --git a/interleaver/interfaces.go b/interleaver/interfaces.go
index 84b0c28..d70845d 100644
--- a/interleaver/interfaces.go
+++ b/interleaver/interfaces.go
@@ -5,12 +5,12 @@
 package main
 
 import (
-	"fmt"
+	"errors"
 
 	"bitbucket.org/s_l_teichmann/mtredisalize/common"
 )
 
-var NoMoreBlocksErr = fmt.Errorf("No more blocks.")
+var NoMoreBlocksErr = errors.New("No more blocks.")
 
 type (
 	Block struct {
diff --git a/interleaver/main.go b/interleaver/main.go
index 0f2c2a1..61f84b9 100644
--- a/interleaver/main.go
+++ b/interleaver/main.go
@@ -5,5 +5,5 @@
 package main
 
 func main() {
-    // TODO: Implement me!
+	// TODO: Implement me!
 }