diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index d7c76d85c..61e97433a 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -22,9 +22,8 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"strings"
-
 	"path/filepath"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common/docserver"
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 36eb488ce..53194ae50 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -27,12 +27,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"math/big"
+	"path/filepath"
 	"runtime"
 	"sort"
 	"time"
 
-	"path/filepath"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index eaf42db28..4db0122d3 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -22,7 +22,6 @@ package main
 
 import (
 	"io/ioutil"
-
 	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/common"
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 8c76a6edb..339dd3f47 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -7,9 +7,8 @@ import (
 	"math/big"
 	"net/http"
 	"os"
-	"runtime"
-
 	"path/filepath"
+	"runtime"
 
 	"github.com/codegangsta/cli"
 	"github.com/ethereum/ethash"
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index d6aa22a48..f456e4fff 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"math/big"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"testing"
 
-	"path/filepath"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
diff --git a/ethdb/database_test.go b/ethdb/database_test.go
index 1979eaa65..a80976a9a 100644
--- a/ethdb/database_test.go
+++ b/ethdb/database_test.go
@@ -2,7 +2,6 @@ package ethdb
 
 import (
 	"os"
-
 	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/common"
diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go
index 45519f71b..f175835a8 100644
--- a/p2p/discover/udp_test.go
+++ b/p2p/discover/udp_test.go
@@ -9,6 +9,7 @@ import (
 	logpkg "log"
 	"net"
 	"os"
+	"path/filepath"
 	"reflect"
 	"runtime"
 	"sync"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/logger"
-    "path/filepath"
 )
 
 func init() {