diff --git a/script.js b/script.js
index 867953c..ce61f11 100644
--- a/script.js
+++ b/script.js
@@ -1,155 +1,96 @@
-const numbers = document.querySelectorAll(".number")
-console.log(numbers)
-
-const numbers = document.querySelectorAll(".number")
-numbers.forEach((number)=> {
-    console.log(number)
-})
-
-const numbers = document.querySelectorAll(".number")
-numbers.forEach((number)=> {
-    number.addEventListener("click", () => {
-        console.log("number is pressed")
-    })
-})
-
-const numbers = document.querySelectorAll(".number")
-numbers.forEach((number)=> {
-    number.addEventListener("click", (event) => {
-        console.log(event.target.value)
-    })
-})
-
-const calculatorScreen = document.querySelector(`.calculator-screen`)
-const updateScreen = (number) => {
-    calculatorScreen.value = number
-}
-
-const calculatorScreen = document.querySelector(`.calculator-screen`)
+const calculatorScreen = document.querySelector('.calculator-screen')
 const updateScreen = (number) => {
     calculatorScreen.value = number
 }
-const numbers = document.querySelectorAll(".number")
-numbers.forEach((number) => {
-    number.addEventListener ("click", (Event) => {
-        updateScreen(Event.target.value)
-    })
-})
-
-let prevNumber = ''
-let calculationOperator = ''
-let currentNumber = '0'
 
+let prevNumber = '';
+let calculationOperator ='';
+let currentNumber = '0';
+const numbers = document.querySelectorAll(".number");
 const inputNumber = (number) => {
-    currentNumber = number
-}
-numbers.forEach((number)=> {
-    number.addEventListener("click",(Event)=> {
-        inputNumber(Event.target.value)
-        updateScreen(currentNumber)
-    })
-})
-const inputNumber =(number) => {
-    currentNumber += number
-}
-const inputNumber = (number) => {
-    if (currentNumber === '0') {
-    } else {
+    if(currentNumber === '0'){
+        currentNumber = number
+    }else{
         currentNumber += number
     }
 }
-const operators = document.querySelectorAll(".operator")
-operators.forEach((operator) => {
-    operator.addEventListener("click", (Event)=> {
-        console.log(Event.target.value)
+numbers.forEach((number) => {
+    number.addEventListener("click", (event) => {
+        inputNumber(event.target.value)
+        updateScreen(currentNumber)
     })
 })
-const inputOperator = (operator) => {
-    prevNumber = currentNumber
-    calculationOperator = operator
-    currentNumber = ''
+
+
+ const inputOperator = (operator) => {
+        if(calculationOperator === ''){
+            prevNumber = currentNumber
+        }
+        calculationOperator = operator
+        currentNumber = '0'
 }
 const operators = document.querySelectorAll(".operator")
+
 operators.forEach((operator) => {
-    operator.addEventListener("click", (Event) => {
-        inputOperator(Event.target.value)
+    operator.addEventListener("click", (event) => {
+        inputOperator(event.target.value)
     })
 })
-const equalSign = document.querySelector('.equal-sign')
-equalSign.addEventListener('click', ()=> {
-    console.log('equal button is pressed')
-})
+
 const calculate = () => {
     let result = ''
-    switch(calculationOperator) {
-        case "+":
-            result = prevNumber + currentNumber
+    switch(calculationOperator){
+        case '+':
+            result = parseFloat(prevNumber) + parseFloat(currentNumber)
             break
-        case "-":
-            result = prevNumber - currentNumber
+        case '-':
+            result = parseFloat(prevNumber) - parseFloat(currentNumber)
             break
-        case "*":
-            result = prevNumber * currentNumber
+        case '*':
+            result = parseFloat(prevNumber) * parseFloat(currentNumber)
             break
-        case "/":
-            result = prevNumber / currentNumber
+        case '/':
+            result = parseFloat(prevNumber) / parseFloat(currentNumber)
             break
         default:
-            return
+            return           
     }
     currentNumber = result
     calculationOperator = ''
 }
+
 const equalSign = document.querySelector('.equal-sign')
+
 equalSign.addEventListener('click', () => {
     calculate()
     updateScreen(currentNumber)
 })
-const calculate = () => {
-    let result = ''
-    switch(calculationOperator) {
-        case '+':
-            result = parseFloat(prevNumber) + parseFloat(currentNumber)
-            break
-    }
-}
-const clearBtn = document.querySelector('.all-clear')
-clearBtn.addEventListener('click', () => {
-    console.log('AC button is pressed')
-})
+
 const clearAll = () => {
-    prevNumber =''
+    prevNumber = ''
     calculationOperator = ''
     currentNumber = '0'
 }
+
 const clearBtn = document.querySelector('.all-clear')
+
 clearBtn.addEventListener('click', () => {
     clearAll()
     updateScreen(currentNumber)
 })
+
 const decimal = document.querySelector('.decimal')
-decimal.addEventListener('click', (Event) => {
-    console.log(Event.target.value)
-})
-inputDecimal = (dot) => {
-    currentNumber += dot
-}
-const decimal = document.querySelector('.decimal')
-decimal.addEventListener('click', (Event) => {
-    inputDecimal(Event.target.value)
-    upsateScreen(currentNumber)
-})
 
 inputDecimal = (dot) => {
-    if(currentNumber.includes('.')) {
+    if(currentNumber.includes('.')){
         return
-        currentNumber += dot
     }
+    currentNumber += dot
 }
-const inputOperator = (operator) => {
-    if (calculationOperator === '') {
-        prevNumber = currentNumber
-    }
-    calculationOperator = operator
-    currentNumber = '0'
-}
\ No newline at end of file
+decimal.addEventListener('click', (event) => {
+    inputDecimal(event.target.value)
+    updateScreen(currentNumber)
+})
+
+
+