diff --git a/weed/command/master.go b/weed/command/master.go
index c8eceb265..c03da7f5d 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -90,7 +90,7 @@ func runMaster(cmd *Command, args []string) bool {
 	grace.SetupProfiling(*masterCpuProfile, *masterMemProfile)
 
 	parent, _ := util.FullPath(*m.metaFolder).DirAndName()
-	if util.FileExists(string(parent)) && !util.FileExists(*m.metaFolder){
+	if util.FileExists(string(parent)) && !util.FileExists(*m.metaFolder) {
 		os.MkdirAll(*m.metaFolder, 0755)
 	}
 	if err := util.TestFolderWritable(util.ResolvePath(*m.metaFolder)); err != nil {
diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go
index 41cb187e4..2be319a62 100644
--- a/weed/filesys/dirty_page.go
+++ b/weed/filesys/dirty_page.go
@@ -14,7 +14,7 @@ import (
 
 var (
 	concurrentWriterLimit = runtime.NumCPU()
-	concurrentWriters = util.NewLimitedConcurrentExecutor(4 * concurrentWriterLimit)
+	concurrentWriters     = util.NewLimitedConcurrentExecutor(4 * concurrentWriterLimit)
 )
 
 type ContinuousDirtyPages struct {
diff --git a/weed/filesys/dirty_page_interval.go b/weed/filesys/dirty_page_interval.go
index 77e1fd66c..1404bf78c 100644
--- a/weed/filesys/dirty_page_interval.go
+++ b/weed/filesys/dirty_page_interval.go
@@ -95,7 +95,7 @@ func (c *ContinuousIntervals) AddInterval(data []byte, offset int64) {
 	// append to the tail and return
 	if len(c.lists) == 1 {
 		lastSpan := c.lists[0]
-		if lastSpan.Tail.Offset + lastSpan.Tail.Size == offset {
+		if lastSpan.Tail.Offset+lastSpan.Tail.Size == offset {
 			lastSpan.addNodeToTail(interval)
 			return
 		}
diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go
index a0e994bf9..e3fef72ac 100644
--- a/weed/filesys/filehandle.go
+++ b/weed/filesys/filehandle.go
@@ -126,7 +126,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) {
 
 	totalRead, err := fh.f.reader.ReadAt(buff, offset)
 
-	if err != nil && err != io.EOF{
+	if err != nil && err != io.EOF {
 		glog.Errorf("file handle read %s: %v", fh.f.fullpath(), err)
 	}
 
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go
index d8f4812ea..ab48b19c1 100644
--- a/weed/s3api/s3api_bucket_handlers.go
+++ b/weed/s3api/s3api_bucket_handlers.go
@@ -67,7 +67,7 @@ func (s3a *S3ApiServer) PutBucketHandler(w http.ResponseWriter, r *http.Request)
 		}); err != nil {
 			glog.Errorf("list collection: %v", err)
 			return fmt.Errorf("list collections: %v", err)
-		}else {
+		} else {
 			for _, c := range resp.Collections {
 				if bucket == c.Name {
 					errCode = s3err.ErrBucketAlreadyExists