diff --git a/dnspod_handler.go b/dnspod_handler.go
index 5240f4d..ead82a0 100644
--- a/dnspod_handler.go
+++ b/dnspod_handler.go
@@ -16,10 +16,10 @@ import (
 	"golang.org/x/net/proxy"
 )
 
-//DNSPodHandler struct definition
+// DNSPodHandler struct definition
 type DNSPodHandler struct{}
 
-//DomainLoop the main logic loop
+// DomainLoop the main logic loop
 func (handler *DNSPodHandler) DomainLoop(domain *Domain, panicChan chan<- Domain) {
 	defer func() {
 		if err := recover(); err != nil {
@@ -69,7 +69,7 @@ func (handler *DNSPodHandler) DomainLoop(domain *Domain, panicChan chan<- Domain
 	}
 }
 
-//GenerateHeader generates the request header for DNSPod API
+// GenerateHeader generates the request header for DNSPod API
 func (handler *DNSPodHandler) GenerateHeader(content url.Values) url.Values {
 	header := url.Values{}
 	if configuration.LoginToken != "" {
@@ -91,7 +91,7 @@ func (handler *DNSPodHandler) GenerateHeader(content url.Values) url.Values {
 	return header
 }
 
-//GetDomain returns specific domain by name
+// GetDomain returns specific domain by name
 func (handler *DNSPodHandler) GetDomain(name string) int64 {
 
 	var ret int64
@@ -140,7 +140,7 @@ func (handler *DNSPodHandler) GetDomain(name string) int64 {
 	return ret
 }
 
-//GetSubDomain returns subdomain by domain id
+// GetSubDomain returns subdomain by domain id
 func (handler *DNSPodHandler) GetSubDomain(domainID int64, name string) (string, string) {
 	log.Println("debug:", domainID, name)
 	var ret, ip string
@@ -185,7 +185,7 @@ func (handler *DNSPodHandler) GetSubDomain(domainID int64, name string) (string,
 	return ret, ip
 }
 
-//UpdateIP update subdomain with current IP
+// UpdateIP update subdomain with current IP
 func (handler *DNSPodHandler) UpdateIP(domainID int64, subDomainID string, subDomainName string, ip string) {
 	value := url.Values{}
 	value.Add("domain_id", strconv.FormatInt(domainID, 10))
@@ -216,7 +216,7 @@ func (handler *DNSPodHandler) UpdateIP(domainID int64, subDomainID string, subDo
 
 }
 
-//PostData post data and invoke DNSPod API
+// PostData post data and invoke DNSPod API
 func (handler *DNSPodHandler) PostData(url string, content url.Values) (string, error) {
 	client := &http.Client{}
 
diff --git a/godns.go b/godns.go
index 3c646d4..3a2bdb2 100644
--- a/godns.go
+++ b/godns.go
@@ -31,7 +31,7 @@ func main() {
 		return
 	}
 
-	//Load settings from configurations file
+	// Load settings from configurations file
 	if err := LoadSettings(*optConf, &configuration); err != nil {
 		fmt.Println(err.Error())
 		log.Println(err.Error())
diff --git a/handler.go b/handler.go
index a805243..81d8e1d 100644
--- a/handler.go
+++ b/handler.go
@@ -1,6 +1,6 @@
 package main
 
-//IHandler is the interface for all DNS handlers
+// IHandler is the interface for all DNS handlers
 type IHandler interface {
 	DomainLoop(domain *Domain, panicChan chan<- Domain)
 }
diff --git a/he_handler.go b/he_handler.go
index 6dd89b4..e72737e 100644
--- a/he_handler.go
+++ b/he_handler.go
@@ -14,14 +14,14 @@ import (
 )
 
 var (
-	//HEUrl the API address for he.net
+	// HEUrl the API address for he.net
 	HEUrl = "https://dyn.dns.he.net/nic/update"
 )
 
-//HEHandler struct
+// HEHandler struct
 type HEHandler struct{}
 
-//DomainLoop the main logic loop
+// DomainLoop the main logic loop
 func (handler *HEHandler) DomainLoop(domain *Domain, panicChan chan<- Domain) {
 	defer func() {
 		if err := recover(); err != nil {
@@ -46,12 +46,12 @@ func (handler *HEHandler) DomainLoop(domain *Domain, panicChan chan<- Domain) {
 			handler.UpdateIP(domain.DomainName, subDomain, currentIP)
 		}
 
-		//Interval is 5 minutes
+		// Interval is 5 minutes
 		time.Sleep(time.Minute * INTERVAL)
 	}
 }
 
-//UpdateIP update subdomain with current IP
+// UpdateIP update subdomain with current IP
 func (handler *HEHandler) UpdateIP(domain, subDomain, currentIP string) {
 	values := url.Values{}
 	values.Add("hostname", fmt.Sprintf("%s.%s", subDomain, domain))
diff --git a/logger.go b/logger.go
index e40c8d7..932c28d 100644
--- a/logger.go
+++ b/logger.go
@@ -86,7 +86,7 @@ func InitLogger(logfile string, size, num int) (err error) {
 	return
 }
 
-// immplement write
+// Write immplement write
 func (logger *Logger) Write(p []byte) (n int, err error) {
 	if logger.DevMode {
 		n, err = os.Stdout.Write(p)