diff --git a/Go/source/idgen/DefaultIdGenerator.go b/Go/source/gen/DefaultIdGenerator.go
similarity index 88%
rename from Go/source/idgen/DefaultIdGenerator.go
rename to Go/source/gen/DefaultIdGenerator.go
index cf396aa..c5beead 100644
--- a/Go/source/idgen/DefaultIdGenerator.go
+++ b/Go/source/gen/DefaultIdGenerator.go
@@ -4,7 +4,7 @@
  * 代码修订：yitter
  * 开源地址：https://gitee.com/yitter/idgenerator
  */
-package idgen
+package gen
 
 import (
 	"math"
@@ -35,7 +35,7 @@ func NewDefaultIdGenerator(options *contract.IdGeneratorOptions) *DefaultIdGener
 
 	maxWorkerIdNumber := uint16(math.Pow(float64(2), float64(options.WorkerIdBitLength))) - 1
 	if options.WorkerId > maxWorkerIdNumber {
-		panic("WorkerId error. (range:[1, "+ string(maxWorkerIdNumber)+ "]")
+		panic("WorkerId error. (range:[1, " + string(maxWorkerIdNumber) + "]")
 	}
 
 	if options.SeqBitLength < 2 || options.SeqBitLength > 21 {
@@ -44,11 +44,11 @@ func NewDefaultIdGenerator(options *contract.IdGeneratorOptions) *DefaultIdGener
 
 	maxSeqNumber := uint32(math.Pow(2, float64(options.SeqBitLength))) - 1
 	if options.MaxSeqNumber > maxSeqNumber {
-		panic("MaxSeqNumber error. (range:[1, "+ string(maxSeqNumber)+ "]")
+		panic("MaxSeqNumber error. (range:[1, " + string(maxSeqNumber) + "]")
 	}
 
 	if options.MinSeqNumber > maxSeqNumber {
-		panic("MinSeqNumber error. (range:[1, "+ string(maxSeqNumber)+ "]")
+		panic("MinSeqNumber error. (range:[1, " + string(maxSeqNumber) + "]")
 	}
 
 	var snowWorker contract.ISnowWorker
diff --git a/Go/source/idgen/YitIdHelper.go b/Go/source/gen/YitIdHelper.go
similarity index 98%
rename from Go/source/idgen/YitIdHelper.go
rename to Go/source/gen/YitIdHelper.go
index a6c47a3..fc93df8 100644
--- a/Go/source/idgen/YitIdHelper.go
+++ b/Go/source/gen/YitIdHelper.go
@@ -4,7 +4,7 @@
  * 代码修订：yitter
  * 开源地址：https://gitee.com/yitter/idgenerator
  */
-package idgen
+package gen
 
 import (
 	"sync"
diff --git a/Go/source/test/main.go b/Go/source/test/main.go
index e25925c..2dbc1c7 100644
--- a/Go/source/test/main.go
+++ b/Go/source/test/main.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"time"
 	"yitidgen/contract"
-	"yitidgen/idgen"
+	"yitidgen/gen"
 )
 
 func main() {
 	// 方法一：直接采用默认方法生成一个Id
-	var yid = idgen.YitIdHelper{}
+	var yid = gen.YitIdHelper{}
 	fmt.Println(yid.NextId())
 
 	// 方法二：自定义参数
@@ -22,7 +22,7 @@ func main() {
 
 	var times = 50000
 
-	for ; ; {
+	for {
 		var begin = time.Now().UnixNano() / 1e6
 		for i := 0; i < times; i++ {
 			yid.NextId()