diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index d4461b66d81..be84bb98ec5 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -118,7 +118,7 @@ func (s *blockService) AddBlocks(bs []blocks.Block) ([]*cid.Cid, error) {
 			toput = append(toput, b)
 		}
 	} else {
-		toput = bs;
+		toput = bs
 	}
 
 	err := s.blockstore.PutMany(toput)
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
index 3317acf9d4e..9d5acf9ce75 100644
--- a/cmd/ipfs/init.go
+++ b/cmd/ipfs/init.go
@@ -8,13 +8,13 @@ import (
 	"os"
 	"path"
 
+	context "context"
 	assets "github.com/ipfs/go-ipfs/assets"
 	cmds "github.com/ipfs/go-ipfs/commands"
 	core "github.com/ipfs/go-ipfs/core"
 	namesys "github.com/ipfs/go-ipfs/namesys"
 	config "github.com/ipfs/go-ipfs/repo/config"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
-	context "context"
 )
 
 const (
diff --git a/core/core_test.go b/core/core_test.go
index 86e8466756e..8f2414a5f5a 100644
--- a/core/core_test.go
+++ b/core/core_test.go
@@ -3,10 +3,10 @@ package core
 import (
 	"testing"
 
+	context "context"
 	"github.com/ipfs/go-ipfs/repo"
 	config "github.com/ipfs/go-ipfs/repo/config"
 	"github.com/ipfs/go-ipfs/thirdparty/testutil"
-	context "context"
 )
 
 func TestInitialization(t *testing.T) {
diff --git a/core/corerepo/stat.go b/core/corerepo/stat.go
index 637195c65c6..26810344fa1 100644
--- a/core/corerepo/stat.go
+++ b/core/corerepo/stat.go
@@ -3,9 +3,9 @@ package corerepo
 import (
 	"fmt"
 
+	context "context"
 	"github.com/ipfs/go-ipfs/core"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
-	context "context"
 )
 
 type Stat struct {
diff --git a/core/coreunix/cat.go b/core/coreunix/cat.go
index 7ca6de802ab..af3f43952c3 100644
--- a/core/coreunix/cat.go
+++ b/core/coreunix/cat.go
@@ -1,10 +1,10 @@
 package coreunix
 
 import (
+	context "context"
 	core "github.com/ipfs/go-ipfs/core"
 	path "github.com/ipfs/go-ipfs/path"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
-	context "context"
 )
 
 func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
diff --git a/fuse/ipns/link_unix.go b/fuse/ipns/link_unix.go
index 04da5a74f7d..0ba9157f757 100644
--- a/fuse/ipns/link_unix.go
+++ b/fuse/ipns/link_unix.go
@@ -5,9 +5,9 @@ package ipns
 import (
 	"os"
 
+	"context"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"context"
 )
 
 type Link struct {
diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go
index 2651d460504..5ecc9076186 100644
--- a/fuse/node/mount_test.go
+++ b/fuse/node/mount_test.go
@@ -9,13 +9,13 @@ import (
 	"testing"
 	"time"
 
+	context "context"
 	core "github.com/ipfs/go-ipfs/core"
 	ipns "github.com/ipfs/go-ipfs/fuse/ipns"
 	mount "github.com/ipfs/go-ipfs/fuse/mount"
 	namesys "github.com/ipfs/go-ipfs/namesys"
 	offroute "github.com/ipfs/go-ipfs/routing/offline"
 	ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
-	context "context"
 )
 
 func maybeSkipFuseTests(t *testing.T) {
diff --git a/importer/helpers/helpers.go b/importer/helpers/helpers.go
index 0bec405a54a..bfde68214a6 100644
--- a/importer/helpers/helpers.go
+++ b/importer/helpers/helpers.go
@@ -3,10 +3,10 @@ package helpers
 import (
 	"fmt"
 
+	"context"
 	chunk "github.com/ipfs/go-ipfs/importer/chunk"
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	ft "github.com/ipfs/go-ipfs/unixfs"
-	"context"
 )
 
 // BlockSizeLimit specifies the maximum size an imported block can have.