diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index b0575f8..b7d674a 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -1,17 +1,39 @@
-import './Assessor.sass'
-import { Logo, Page, Row, Padding, ModalButton, Button, Clickable, Link, Modal, Column, Box, Input } from '../../components'
-import { FiLogOut } from 'solid-icons/fi'
 import { Tabs } from '@kobalte/core/tabs'
-import { onMount, createSignal, createEffect } from 'solid-js'
-import { Show } from 'solid-js/web'
-import dayjs from 'dayjs'
-import { checkConnection, createPdfOccupancy, createPdfElectrical } from '../../utils/functions'
-import { FaSolidThumbsUp } from 'solid-icons/fa'
-import { _employeeName, _employeeId } from '../../stores/employee'
 import { useNavigate } from '@solidjs/router'
-import { _applicationNo, _date, _optn, _name, _location, _type, _assessor, _feeList, _codeList, _amountList, _signatureAssessor, _signatureApprover, _assessorid, _approvedDate, _assessedDate, _units, _totalUnits, _floorArea, _additional, _additionalFeeList, _additionalAmountList, _additionalCodeList, _additionalUnitList } from '../../stores/pdfinfo'
+import dayjs from 'dayjs'
+import { FaSolidThumbsUp } from 'solid-icons/fa'
+import { FiLogOut } from 'solid-icons/fi'
 import { VsRefresh } from 'solid-icons/vs'
-import { getApi, getApiMulti, postApi } from '../../utils/functions'
+import { createEffect, createSignal, onMount } from 'solid-js'
+import { Show } from 'solid-js/web'
+import { Box, Button, Clickable, Column, Input, Link, Logo, Modal, ModalButton, Padding, Page, Row } from '../../components'
+import {
+  _additional,
+  _additionalAmountList,
+  _additionalCodeList,
+  _additionalFeeList,
+  _additionalUnitList,
+  _amountList,
+  _applicationNo,
+  _approvedDate,
+  _assessedDate,
+  _assessor,
+  _assessorid,
+  _codeList,
+  _date,
+  _feeList,
+  _floorArea,
+  _location,
+  _name,
+  _optn,
+  _signatureApprover,
+  _signatureAssessor,
+  _totalUnits,
+  _type,
+  _units,
+} from '../../stores/pdfinfo'
+import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, postApi } from '../../utils/functions'
+import './Assessor.sass'
 
 const PESO = import.meta.env.VITE_PESO
 
@@ -25,9 +47,6 @@ export default () => {
   const [type, setType] = createSignal('')
   const [applicationId, setApplicationId] = createSignal(0)
 
-  // const [applicationList, setApplicationList] = createSignal<string[]>([])
-  // const [nameList, setNameList] = createSignal<string[]>([])
-
   const [applicationListElectrical, setApplicationListElectrical] = createSignal<string[]>([])
   const [nameListElectrical, setNameListElectrical] = createSignal<string[]>([])
   const [applicationListOccupancy, setApplicationListOccupancy] = createSignal<string[]>([])
@@ -78,7 +97,7 @@ export default () => {
       _floorArea.set(floorArea)
     }
 
-    _optn.set('M' + applicationno.split('-')[0] + applicationno.split('-')[1])
+    _optn.set(`M${applicationno.split('-')[0]}${applicationno.split('-')[1]}`)
     _applicationNo.set(applicationno)
     _date.set(dayjs(date).format('MMMM DD, YYYY'))
     _name.set(name)