diff --git a/download.go b/download.go
index dbd44de6..53ed0991 100644
--- a/download.go
+++ b/download.go
@@ -96,7 +96,7 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
 	if trim {
 		err = exec.Command("/bin/sh", "-c",
 			config.TarBin+" --strip-components 2 --include='*/"+fileName[:len(fileName)-7]+"/trunk/' -xf "+tarLocation+" -C "+path).Run()
-		os.Rename(filepath.Join(path, "trunk"), filepath.Join(path,fileName[:len(fileName)-7]))
+		os.Rename(filepath.Join(path, "trunk"), filepath.Join(path, fileName[:len(fileName)-7]))
 	} else {
 		err = exec.Command(config.TarBin, "-xf", tarLocation, "-C", path).Run()
 	}
diff --git a/parser.go b/parser.go
index 826bd075..01645317 100644
--- a/parser.go
+++ b/parser.go
@@ -3,11 +3,11 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"html"
 	"io"
 	"os"
 	"strconv"
 	"strings"
-	"html"
 )
 
 // A basic set implementation for strings.