diff --git a/context/context.go b/context/context.go
index bd9eaee..60a3bb6 100644
--- a/context/context.go
+++ b/context/context.go
@@ -96,12 +96,13 @@ type AppSessionData struct {
 	// (compN/compN-subCompN/appId-%s) map to PccRule
 	RelatedPccRuleIds    map[string]string
 	PccRuleIdMapToCompId map[string]string
-	// EventSubscription
-	Events map[models.AfEvent]models.AfNotifMethod
 	// related Session
 	SmPolicyData *UeSmPolicyData
+	// EventSubscription
+	Events   map[models.AfEvent]models.AfNotifMethod
+	EventUri string
+
 	AppSessionId string
-	EventUri     string
 }
 
 // Create new PCF context
diff --git a/context/ue.go b/context/ue.go
index bf9007c..a07bdd1 100644
--- a/context/ue.go
+++ b/context/ue.go
@@ -19,11 +19,6 @@ import (
 
 // key is supi
 type UeContext struct {
-	// Ue Context
-	Supi         string
-	Gpsi         string
-	Pei          string
-	AMPolicyData map[string]*UeAMPolicyData // use PolAssoId(ue.Supi-numPolId) as key
 	// Udr Ref
 	UdrUri string
 	// SMPolicy
@@ -39,6 +34,11 @@ type UeContext struct {
 	PolicyDataSubscriptionStore *models.PolicyDataSubscription
 	PolicyDataChangeStore       *models.PolicyDataChangeNotification
 
+	// Ue Context
+	Supi                      string
+	Gpsi                      string
+	Pei                       string
+	AMPolicyData              map[string]*UeAMPolicyData // use PolAssoId(ue.Supi-numPolId) as key
 	GroupIds                  []string
 	PolAssociationIDGenerator uint32
 }
@@ -55,10 +55,6 @@ type UeAMPolicyData struct {
 	Guami        *models.Guami
 	ServiveName  string
 	// TraceReq *TraceData
-	ServAreaRes *models.ServiceAreaRestriction
-	UserLoc     *models.UserLocation
-	TimeZone    string
-	SuppFeat    string
 	// about AF request
 	Pras map[string]models.PresenceInfo
 	// related to UDR Subscription Data
@@ -66,8 +62,12 @@ type UeAMPolicyData struct {
 	// Corresponding UE
 	PcfUe *UeContext
 	// Policy Association
-	Triggers []models.RequestTrigger
-	Rfsp     int32
+	ServAreaRes *models.ServiceAreaRestriction
+	UserLoc     *models.UserLocation
+	TimeZone    string
+	SuppFeat    string
+	Triggers    []models.RequestTrigger
+	Rfsp        int32
 }
 
 type UeSmPolicyData struct {
diff --git a/factory/config.go b/factory/config.go
index b02c3af..f8d98f1 100644
--- a/factory/config.go
+++ b/factory/config.go
@@ -45,10 +45,11 @@ type Configuration struct {
 	ServiceList     []Service `yaml:"serviceList,omitempty"`
 	Mongodb         *Mongodb  `yaml:"mongodb"`
 
-	/* below config received from RoC */
+	// config received from RoC
 	DnnList   map[string][]string // sst+sd os key
 	SlicePlmn map[string]PlmnSupportItem
-	PlmnList  []PlmnSupportItem `yaml:"plmnList,omitempty"`
+
+	PlmnList []PlmnSupportItem `yaml:"plmnList,omitempty"`
 }
 
 type Service struct {