diff --git a/hugolib/helpers.go b/hugolib/helpers.go
index 9695f6310..cf84835fd 100644
--- a/hugolib/helpers.go
+++ b/hugolib/helpers.go
@@ -334,7 +334,7 @@ func MakePermalink(domain string, path string) string {
 }
 
 func getSummaryString(content []byte) ([]byte, bool) {
-	if (bytes.Contains(content, summaryDivider)) {
+	if bytes.Contains(content, summaryDivider) {
 		return bytes.Split(content, summaryDivider)[0], false
 	} else {
 		plainContent := StripHTML(StripShortcodes(string(content)))
diff --git a/hugolib/site.go b/hugolib/site.go
index 4f8444480..af72fd3bf 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -121,7 +121,7 @@ func (site *Site) Render() (err error) {
 	site.timerStep("render pages")
 	if err = site.RenderHomePage(); err != nil {
 		return
-        }
+	}
 	site.timerStep("render and write homepage")
 	return
 }
@@ -203,7 +203,7 @@ func (s *Site) initialize() {
 
 	s.checkDirectories()
 
-	staticDir := s.Config.GetAbsPath(s.Config.StaticDir+"/")
+	staticDir := s.Config.GetAbsPath(s.Config.StaticDir + "/")
 
 	walker := func(path string, fi os.FileInfo, err error) error {
 		if err != nil {
@@ -212,7 +212,7 @@ func (s *Site) initialize() {
 		}
 
 		if fi.IsDir() {
-			if (path == staticDir) {
+			if path == staticDir {
 				return filepath.SkipDir
 			}
 			site.Directories = append(site.Directories, path)
@@ -432,7 +432,7 @@ func inStringArray(arr []string, el string) bool {
 func (s *Site) RenderAliases() error {
 	for i, p := range s.Pages {
 		for _, a := range p.Aliases {
-			t := "alias";
+			t := "alias"
 			if strings.HasSuffix(a, ".xhtml") {
 				t = "alias-xhtml"
 			}
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 249eba266..4df0bd604 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -1,8 +1,8 @@
 package hugolib
 
 import (
-	"fmt"
 	"bytes"
+	"fmt"
 	"strings"
 	"testing"
 )
@@ -164,16 +164,17 @@ func TestRenderThingOrDefault(t *testing.T) {
 		if string(html.Bytes()) != test.expected {
 			t.Errorf("Content does not match.  Expected '%s', got '%s'", test.expected, html)
 		}
-	}}
+	}
+}
 
 func TestSetOutFile(t *testing.T) {
-    s := new(Site)
+	s := new(Site)
 	p := pageMust(ReadFrom(strings.NewReader(PAGE_URL_SPECIFIED), "content/a/file.md"))
-    s.setOutFile(p)
+	s.setOutFile(p)
 
-    expected := "mycategory/my-whatever-content/index.html"
+	expected := "mycategory/my-whatever-content/index.html"
 
-    if p.OutFile != "mycategory/my-whatever-content/index.html" {
-        t.Errorf("Outfile does not match.  Expected '%s', got '%s'", expected, p.OutFile)
-    }
+	if p.OutFile != "mycategory/my-whatever-content/index.html" {
+		t.Errorf("Outfile does not match.  Expected '%s', got '%s'", expected, p.OutFile)
+	}
 }