diff --git a/templates/index.ts b/templates/index.ts
index 7b93fa79..c49f58fd 100644
--- a/templates/index.ts
+++ b/templates/index.ts
@@ -47,10 +47,16 @@ router.register(VIEWS.registerUser, register.index);
 router.register(VIEWS.loginUser, login.index);
 router.register(VIEWS.notifications, notidications.index);
 router.register(VIEWS.listSitekey, listSitekeys.index);
-router.register(VIEWS.addSiteKeyAdvance,addSiteKeyAdvance.index);
+router.register(VIEWS.addSiteKeyAdvance, addSiteKeyAdvance.index);
 router.register(VIEWS.addSiteKeyEasy, addSiteKeyEasy.index);
-router.register(VIEWS.editSitekeyAdvance("[A-Z),a-z,0-9]+"), editSitekeyAdvance.index);
-router.register(VIEWS.editSitekeyEasy("[A-Z),a-z,0-9]+"), editSitekeyEasy.index);
+router.register(
+  VIEWS.editSitekeyAdvance("[A-Z),a-z,0-9]+"),
+  editSitekeyAdvance.index
+);
+router.register(
+  VIEWS.editSitekeyEasy("[A-Z),a-z,0-9]+"),
+  editSitekeyEasy.index
+);
 router.register(VIEWS.deleteSitekey("[A-Z),a-z,0-9]+"), deleteSitekey.index);
 
 try {
diff --git a/templates/panel/sitekey/add/novice/ts/form.ts b/templates/panel/sitekey/add/novice/ts/form.ts
index fc28d852..332e8fc4 100644
--- a/templates/panel/sitekey/add/novice/ts/form.ts
+++ b/templates/panel/sitekey/add/novice/ts/form.ts
@@ -30,14 +30,6 @@ export const FORM = <HTMLFormElement>(
   document.querySelector(`.${SITE_KEY_FORM_CLASS}`)
 );
 
-export const AVG_TRAFFIC = <HTMLInputElement>FORM.querySelector("#avg_traffic");
-export const PEAK_TRAFFIC = <HTMLInputElement>(
-  FORM.querySelector("#peak_sustainable_traffic")
-);
-export const BROKE_MY_SITE_TRAFFIC = <HTMLInputElement>(
-  FORM.querySelector("#broke_my_site_traffic")
-);
-
 export const addSubmitEventListener = (): void =>
   FORM.addEventListener("submit", submit, true);
 
@@ -57,6 +49,16 @@ export const validate = (e: Event): TrafficPattern => {
 
   let broke_is_set = false;
 
+  const AVG_TRAFFIC = <HTMLInputElement>(
+    FORM.querySelector("#avg_traffic")
+  );
+  const PEAK_TRAFFIC = <HTMLInputElement>(
+    FORM.querySelector("#peak_sustainable_traffic")
+  );
+  const BROKE_MY_SITE_TRAFFIC = <HTMLInputElement>(
+    FORM.querySelector("#broke_my_site_traffic")
+  );
+
   isBlankString(AVG_TRAFFIC.value, avg_traffic_name);
   isBlankString(PEAK_TRAFFIC.value, peak_traffic_name);
 
diff --git a/templates/panel/sitekey/edit/easy/form.ts b/templates/panel/sitekey/edit/easy/form.ts
index 6e821bea..93859fa4 100644
--- a/templates/panel/sitekey/edit/easy/form.ts
+++ b/templates/panel/sitekey/edit/easy/form.ts
@@ -25,10 +25,10 @@ import { validate, FORM } from "../../add/novice/ts/form";
 const SUBMIT_BTN = <HTMLButtonElement>(
   document.querySelector(".sitekey-form__submit")
 );
-const key = SUBMIT_BTN.dataset.sitekey;
 const submit = async (e: Event) => {
   e.preventDefault();
 
+  const key = SUBMIT_BTN.dataset.sitekey;
   const formUrl = getFormUrl(FORM);
   const payload = {
     pattern: validate(e),