diff --git a/weed/filer2/cassandra/cassandra_store.go b/weed/filer2/cassandra/cassandra_store.go
index 72680b5e1..627de3055 100644
--- a/weed/filer2/cassandra/cassandra_store.go
+++ b/weed/filer2/cassandra/cassandra_store.go
@@ -40,13 +40,13 @@ func (store *CassandraStore) initialize(keyspace string, hosts []string) (err er
 	return
 }
 
-func (store *CassandraStore) BeginTransaction(ctx context.Context) (context.Context, error){
+func (store *CassandraStore) BeginTransaction(ctx context.Context) (context.Context, error) {
 	return ctx, nil
 }
-func (store *CassandraStore) CommitTransaction(ctx context.Context) error{
+func (store *CassandraStore) CommitTransaction(ctx context.Context) error {
 	return nil
 }
-func (store *CassandraStore) RollbackTransaction(ctx context.Context) error{
+func (store *CassandraStore) RollbackTransaction(ctx context.Context) error {
 	return nil
 }
 
diff --git a/weed/filer2/leveldb/leveldb_store.go b/weed/filer2/leveldb/leveldb_store.go
index 97df9163b..5b3a63959 100644
--- a/weed/filer2/leveldb/leveldb_store.go
+++ b/weed/filer2/leveldb/leveldb_store.go
@@ -46,13 +46,13 @@ func (store *LevelDBStore) initialize(dir string) (err error) {
 	return
 }
 
-func (store *LevelDBStore) BeginTransaction(ctx context.Context) (context.Context, error){
+func (store *LevelDBStore) BeginTransaction(ctx context.Context) (context.Context, error) {
 	return ctx, nil
 }
-func (store *LevelDBStore) CommitTransaction(ctx context.Context) error{
+func (store *LevelDBStore) CommitTransaction(ctx context.Context) error {
 	return nil
 }
-func (store *LevelDBStore) RollbackTransaction(ctx context.Context) error{
+func (store *LevelDBStore) RollbackTransaction(ctx context.Context) error {
 	return nil
 }
 
diff --git a/weed/filer2/memdb/memdb_store.go b/weed/filer2/memdb/memdb_store.go
index 811c87440..855a13faa 100644
--- a/weed/filer2/memdb/memdb_store.go
+++ b/weed/filer2/memdb/memdb_store.go
@@ -34,13 +34,13 @@ func (store *MemDbStore) Initialize(configuration util.Configuration) (err error
 	return nil
 }
 
-func (store *MemDbStore) BeginTransaction(ctx context.Context) (context.Context, error){
+func (store *MemDbStore) BeginTransaction(ctx context.Context) (context.Context, error) {
 	return ctx, nil
 }
-func (store *MemDbStore) CommitTransaction(ctx context.Context) error{
+func (store *MemDbStore) CommitTransaction(ctx context.Context) error {
 	return nil
 }
-func (store *MemDbStore) RollbackTransaction(ctx context.Context) error{
+func (store *MemDbStore) RollbackTransaction(ctx context.Context) error {
 	return nil
 }
 
diff --git a/weed/filer2/redis/universal_redis_store.go b/weed/filer2/redis/universal_redis_store.go
index 72e9ce8b3..ce41d4d70 100644
--- a/weed/filer2/redis/universal_redis_store.go
+++ b/weed/filer2/redis/universal_redis_store.go
@@ -19,13 +19,13 @@ type UniversalRedisStore struct {
 	Client redis.UniversalClient
 }
 
-func (store *UniversalRedisStore) BeginTransaction(ctx context.Context) (context.Context, error){
+func (store *UniversalRedisStore) BeginTransaction(ctx context.Context) (context.Context, error) {
 	return ctx, nil
 }
-func (store *UniversalRedisStore) CommitTransaction(ctx context.Context) error{
+func (store *UniversalRedisStore) CommitTransaction(ctx context.Context) error {
 	return nil
 }
-func (store *UniversalRedisStore) RollbackTransaction(ctx context.Context) error{
+func (store *UniversalRedisStore) RollbackTransaction(ctx context.Context) error {
 	return nil
 }
 
diff --git a/weed/server/filer_grpc_server_rename.go b/weed/server/filer_grpc_server_rename.go
index 600cc3ca7..5d5af506d 100644
--- a/weed/server/filer_grpc_server_rename.go
+++ b/weed/server/filer_grpc_server_rename.go
@@ -38,7 +38,7 @@ func (fs *FilerServer) AtomicRenameEntry(ctx context.Context, req *filer_pb.Atom
 	return &filer_pb.AtomicRenameEntryResponse{}, nil
 }
 
-func (fs *FilerServer) moveEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) (error) {
+func (fs *FilerServer) moveEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) error {
 	if entry.IsDirectory() {
 		if err := fs.moveFolderSubEntries(ctx, oldParent, entry, newParent, newName); err != nil {
 			return err
@@ -47,7 +47,7 @@ func (fs *FilerServer) moveEntry(ctx context.Context, oldParent filer2.FullPath,
 	return fs.moveSelfEntry(ctx, oldParent, entry, newParent, newName)
 }
 
-func (fs *FilerServer) moveFolderSubEntries(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) (error) {
+func (fs *FilerServer) moveFolderSubEntries(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) error {
 
 	currentDirPath := oldParent.Child(entry.Name())
 	newDirPath := newParent.Child(newName)
@@ -80,7 +80,7 @@ func (fs *FilerServer) moveFolderSubEntries(ctx context.Context, oldParent filer
 	return nil
 }
 
-func (fs *FilerServer) moveSelfEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) (error) {
+func (fs *FilerServer) moveSelfEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string) error {
 
 	oldPath, newPath := oldParent.Child(entry.Name()), newParent.Child(newName)
 
diff --git a/weed/shell/command_fs_ls.go b/weed/shell/command_fs_ls.go
index 39f356916..b94f24694 100644
--- a/weed/shell/command_fs_ls.go
+++ b/weed/shell/command_fs_ls.go
@@ -54,7 +54,7 @@ func (c *commandFsLs) Do(args []string, commandEnv *commandEnv, writer io.Writer
 		if path == "/" {
 			dir, name = "/", ""
 		} else {
-			dir, name = path[0 : len(path)-1], ""
+			dir, name = path[0:len(path)-1], ""
 		}
 	}
 
diff --git a/weed/shell/command_fs_tree.go b/weed/shell/command_fs_tree.go
index 019616627..805b17d2a 100644
--- a/weed/shell/command_fs_tree.go
+++ b/weed/shell/command_fs_tree.go
@@ -39,7 +39,7 @@ func (c *commandFsTree) Do(args []string, commandEnv *commandEnv, writer io.Writ
 		if path == "/" {
 			dir, name = "/", ""
 		} else {
-			dir, name = path[0 : len(path)-1], ""
+			dir, name = path[0:len(path)-1], ""
 		}
 	}
 
@@ -124,7 +124,7 @@ func (p *Prefix) getPrefix(level int, isLastChild bool) string {
 	}
 	if isLastChild {
 		sb.WriteString("└──")
-		p.removeMarker(level);
+		p.removeMarker(level)
 	} else {
 		sb.WriteString("├──")
 	}