diff --git a/src/assignment0.js b/src/assignment0.js
index b9772a3..bec4104 100644
--- a/src/assignment0.js
+++ b/src/assignment0.js
@@ -1,38 +1,36 @@
-var num = parseInt(prompt('Enter a natural number or "exit"'));
+var num = prompt('Enter a natural number or "exit"');
 
-var c = 1;
-var primeArr = [2];
-var i = 3;
+while (num !== 'exit') {
 
-function isPrime(k) {
-    for (var j = 2; j < k; j++) {
-        if (k % j === 0) {
-            return false;
+    var count = 0;
+    var primeArr = [];
+    var startPrimeNum = 2;
+
+    while (count < parseInt(num)) {
+        var isPrime = true;
+        for (j = 2; j < startPrimeNum; j++) {
+            if (startPrimeNum % j === 0) {
+                isPrime = false;
+            }
         }
-    }
-    return true;
-}
 
-while (c < num) {
-    if (isPrime(i)) {
-        primeArr[c] = i;
-        c++;
+        if (isPrime) {
+            primeArr[count] = startPrimeNum;
+            count++;
+        }
+        startPrimeNum++;
     }
-    i++;
-}
 
-
-console.log(primeArr);
-
-for (let i = 0; i < primeArr.length - 1; i++) {
-    for (var j = 0; j < primeArr.length - 1; j++) {
-        if ((primeArr[j] % 10) > (primeArr[j + 1] % 10)) {
-            let c = primeArr[j];
-            primeArr[j] = primeArr[j + 1];
-            primeArr[j + 1] = c;
+    for (var i = 0; i < primeArr.length - 1; i++) {
+        for (var j = 0; j < primeArr.length - 1; j++) {
+            if ((primeArr[j] % 10) > (primeArr[j + 1] % 10)) {
+                var sort = primeArr[j];
+                primeArr[j] = primeArr[j + 1];
+                primeArr[j + 1] = sort;
+            }
         }
     }
 
-}
-
-console.log(primeArr);
\ No newline at end of file
+    console.log(primeArr);
+    num = prompt('Enter a natural number or "exit"');
+}
\ No newline at end of file