diff --git a/src/common/dao/dao_test.go b/src/common/dao/dao_test.go
index 03252787e..a9cbbe8e4 100644
--- a/src/common/dao/dao_test.go
+++ b/src/common/dao/dao_test.go
@@ -1112,7 +1112,7 @@ func TestAddRepJob(t *testing.T) {
 func TestUpdateRepJobStatus(t *testing.T) {
 	err := UpdateRepJobStatus(jobID, models.JobFinished)
 	if err != nil {
-		t.Errorf("Error occured in UpdateRepJobStatus, error: %v, id: %d", err, jobID)
+		t.Errorf("Error occurred in UpdateRepJobStatus, error: %v, id: %d", err, jobID)
 		return
 	}
 	j, err := GetRepJob(jobID)
@@ -1127,7 +1127,7 @@ func TestUpdateRepJobStatus(t *testing.T) {
 	}
 	err = UpdateRepJobStatus(jobID, models.JobPending)
 	if err != nil {
-		t.Errorf("Error occured in UpdateRepJobStatus when update it back to status pending, error: %v, id: %d", err, jobID)
+		t.Errorf("Error occurred in UpdateRepJobStatus when update it back to status pending, error: %v, id: %d", err, jobID)
 		return
 	}
 }
@@ -1135,7 +1135,7 @@ func TestUpdateRepJobStatus(t *testing.T) {
 func TestGetRepPolicyByProject(t *testing.T) {
 	p1, err := GetRepPolicyByProject(99)
 	if err != nil {
-		t.Errorf("Error occured in GetRepPolicyByProject:%v, project ID: %d", err, 99)
+		t.Errorf("Error occurred in GetRepPolicyByProject:%v, project ID: %d", err, 99)
 		return
 	}
 	if len(p1) > 0 {
@@ -1161,7 +1161,7 @@ func TestGetRepPolicyByProject(t *testing.T) {
 func TestGetRepJobByPolicy(t *testing.T) {
 	jobs, err := GetRepJobByPolicy(999)
 	if err != nil {
-		t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, 999)
+		t.Errorf("Error occurred in GetRepJobByPolicy: %v, policy ID: %d", err, 999)
 		return
 	}
 	if len(jobs) > 0 {
@@ -1170,7 +1170,7 @@ func TestGetRepJobByPolicy(t *testing.T) {
 	}
 	jobs, err = GetRepJobByPolicy(policyID)
 	if err != nil {
-		t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, policyID)
+		t.Errorf("Error occurred in GetRepJobByPolicy: %v, policy ID: %d", err, policyID)
 		return
 	}
 	if len(jobs) != 1 {
@@ -1186,7 +1186,7 @@ func TestGetRepJobByPolicy(t *testing.T) {
 func TestFilterRepJobs(t *testing.T) {
 	jobs, _, err := FilterRepJobs(policyID, "", "", nil, nil, 1000, 0)
 	if err != nil {
-		t.Errorf("Error occured in FilterRepJobs: %v, policy ID: %d", err, policyID)
+		t.Errorf("Error occurred in FilterRepJobs: %v, policy ID: %d", err, policyID)
 		return
 	}
 	if len(jobs) != 1 {
@@ -1202,13 +1202,13 @@ func TestFilterRepJobs(t *testing.T) {
 func TestDeleteRepJob(t *testing.T) {
 	err := DeleteRepJob(jobID)
 	if err != nil {
-		t.Errorf("Error occured in DeleteRepJob: %v, id: %d", err, jobID)
+		t.Errorf("Error occurred in DeleteRepJob: %v, id: %d", err, jobID)
 		return
 	}
 	t.Logf("deleted rep job, id: %d", jobID)
 	j, err := GetRepJob(jobID)
 	if err != nil {
-		t.Errorf("Error occured in GetRepJob:%v", err)
+		t.Errorf("Error occurred in GetRepJob:%v", err)
 		return
 	}
 	if j != nil {
@@ -1271,7 +1271,7 @@ func TestGetRepoJobToStop(t *testing.T) {
 func TestDeleteRepTarget(t *testing.T) {
 	err := DeleteRepTarget(targetID)
 	if err != nil {
-		t.Errorf("Error occured in DeleteRepTarget: %v, id: %d", err, targetID)
+		t.Errorf("Error occurred in DeleteRepTarget: %v, id: %d", err, targetID)
 		return
 	}
 	t.Logf("deleted target, id: %d", targetID)
@@ -1304,13 +1304,13 @@ func TestUpdateRepPolicy(t *testing.T) {
 func TestDeleteRepPolicy(t *testing.T) {
 	err := DeleteRepPolicy(policyID)
 	if err != nil {
-		t.Errorf("Error occured in DeleteRepPolicy: %v, id: %d", err, policyID)
+		t.Errorf("Error occurred in DeleteRepPolicy: %v, id: %d", err, policyID)
 		return
 	}
 	t.Logf("delete rep policy, id: %d", policyID)
 	p, err := GetRepPolicy(policyID)
 	if err != nil && err != orm.ErrNoRows {
-		t.Errorf("Error occured in GetRepPolicy:%v", err)
+		t.Errorf("Error occurred in GetRepPolicy:%v", err)
 	}
 	if p != nil && p.Deleted != 1 {
 		t.Errorf("Able to find rep policy after deletion, id: %d", policyID)
diff --git a/src/common/dao/scan_job.go b/src/common/dao/scan_job.go
index ae62ddc9a..4da813aec 100644
--- a/src/common/dao/scan_job.go
+++ b/src/common/dao/scan_job.go
@@ -167,7 +167,7 @@ func UpdateImgScanOverview(digest, detailsKey string, sev models.Severity, compO
 	return nil
 }
 
-// ListImgScanOverviews list all records in table img_scan_overview, it is called in notificaiton handler when it needs to refresh the severity of all images.
+// ListImgScanOverviews list all records in table img_scan_overview, it is called in notification handler when it needs to refresh the severity of all images.
 func ListImgScanOverviews() ([]*models.ImgScanOverview, error) {
 	var res []*models.ImgScanOverview
 	o := GetOrmer()
diff --git a/src/common/notifier/notifier.go b/src/common/notifier/notifier.go
index d88690b8d..c2519cfc3 100644
--- a/src/common/notifier/notifier.go
+++ b/src/common/notifier/notifier.go
@@ -31,7 +31,7 @@ type HandlerChannel struct {
 	//To indicate how many handler instances bound with this chan.
 	boundCount uint32
 
-	//The chan for controling concurrent executions.
+	//The chan for controlling concurrent executions.
 	channel chan bool
 }
 
@@ -199,7 +199,7 @@ func (nw *NotificationWatcher) Notify(notification Notification) error {
 				}()
 				if err := hd.Handle(notification.Value); err != nil {
 					//Currently, we just log the error
-					log.Errorf("Error occurred when triggerring handler %s of topic %s: %s\n", reflect.TypeOf(hd).String(), notification.Topic, err.Error())
+					log.Errorf("Error occurred when triggering handler %s of topic %s: %s\n", reflect.TypeOf(hd).String(), notification.Topic, err.Error())
 				} else {
 					log.Infof("Handle notification with topic '%s': %#v\n", notification.Topic, notification.Value)
 				}
diff --git a/src/common/scheduler/policy/alternate_policy.go b/src/common/scheduler/policy/alternate_policy.go
index e37b466f4..52ca37589 100644
--- a/src/common/scheduler/policy/alternate_policy.go
+++ b/src/common/scheduler/policy/alternate_policy.go
@@ -77,7 +77,7 @@ func (alp *AlternatePolicy) Done() <-chan bool {
 
 //AttachTasks is an implementation of same method in policy interface.
 func (alp *AlternatePolicy) AttachTasks(tasks ...task.Task) error {
-	if tasks == nil || len(tasks) == 0 {
+	if len(tasks) == 0 {
 		return errors.New("No tasks can be attached")
 	}