diff --git a/.golangci.yml b/.golangci.yml
index 885ea5ac..0f63c1d8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -220,35 +220,35 @@ linters-settings:
 linters:
   enable:
     - gofmt
-    - govet
-    - errcheck
-    - staticcheck
-    - unused
-    - gosimple
-    - structcheck
-    - varcheck
+    # - govet
+    # - errcheck
+    # - staticcheck
+    # - unused
+    # - gosimple
+    # - structcheck
+    # - varcheck
     - ineffassign
-    - deadcode
-    - typecheck
+    # - deadcode
+    # - typecheck
     # Additional
-    - lll
+    # - lll
     - godox
-    #- gomnd
-    #- goconst
+    # - gomnd
+    # - goconst
     # - gocognit
     # - maligned
     # - nestif
     # - gomodguard
-    - nakedret
-    - gci
-    - misspell
-    - gofumpt
-    - whitespace
-    - unconvert
-    - predeclared
-    - noctx
+    # - nakedret
+    # - gci
+    # - misspell
+    # - gofumpt
+    # - whitespace
+    # - unconvert
+    # - predeclared
+    # - noctx
     - dogsled
-    - bodyclose
+    # - bodyclose
     - asciicheck
       #- stylecheck
       # - unparam
diff --git a/fsm/handler.go b/fsm/handler.go
index 1de1bc7f..62fe11c1 100644
--- a/fsm/handler.go
+++ b/fsm/handler.go
@@ -35,9 +35,9 @@ type SmEventData struct {
 }
 
 // Define FSM Func Point Struct here
-type fsmHandler [smf_context.SmStateMax][SmEventMax]func(event SmEvent, eventData *SmEventData) (smf_context.SMContextState, error)
+type eventHandler func(event SmEvent, eventData *SmEventData) (smf_context.SMContextState, error)
 
-var SmfFsmHandler fsmHandler
+var SmfFsmHandler [smf_context.SmStateMax][SmEventMax]eventHandler
 
 func init() {
 	//Initilise with default invalid handler