diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index a97d305..4095fc4 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="DDEV" uuid="4e41cde9-514c-4972-ba5c-ef4322763eb5">
+    <data-source source="LOCAL" name="DDEV" uuid="791af1b4-fe47-4b86-b04d-3a852feea052">
       <driver-ref>mariadb</driver-ref>
       <synchronize>true</synchronize>
       <configured-by-url>true</configured-by-url>
       <remarks>DDEV generated data source</remarks>
       <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mariadb://127.0.0.1:12526/db?user=db&amp;password=db</jdbc-url>
+      <jdbc-url>jdbc:mariadb://127.0.0.1:32771/db?user=db&amp;password=db</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
diff --git a/public/js/frontend.js b/public/js/frontend.js
index 45642e4..5737474 100644
--- a/public/js/frontend.js
+++ b/public/js/frontend.js
@@ -40,26 +40,46 @@ function setButtonAttributes(buttonType) {
     return button;
 }
 
-function addViewButton(tableData, printer) {
-    const viewButton = setButtonAttributes('btn-primary');
-    viewButton.textContent = 'View';
-    viewButton.id = `printer${printer.id}:viewButton`;
-
-    viewButton.onclick = function() {
+function setViewButtonOnClick(viewButton, printer) {
+    viewButton.onclick = function () {
         document.getElementById('viewModalName').textContent = `Name: ${printer.name}`;
         document.getElementById('viewModalPrice').textContent = `Price: ${printer.price.toFixed(2)}$`;
         document.getElementById('viewModalBuildVolume').textContent = `Build Volume: ${printer.build_volume}`;
         document.getElementById('viewModalMaxSpeed').textContent = `Max Speed: ${printer.max_speed}mm/s`;
     }
+}
+
+function addViewButton(tableData, printer) {
+    const viewButton = setButtonAttributes('btn-primary');
+    viewButton.textContent = 'View';
+    viewButton.id = `printer${printer.id}:viewButton`;
+
+    setViewButtonOnClick(viewButton, printer);
 
     tableData.appendChild(viewButton);
 }
 
-function editPrinter(printerId) {
+function setEditButtonOnClick(editButton, printer) {
+    editButton.onclick = function () {
+        document.getElementById('editInputName').value = printer.name;
+        document.getElementById('editInputPrice').value = printer.price;
+        document.getElementById('editInputBuildVolume').value = printer.build_volume;
+        document.getElementById('editInputMaxSpeed').value = printer.max_speed;
+
+        document.getElementById('editModalConfirm').setAttribute('onclick', `editPrinter(${printer.id})`);
+    }
+}
+
+function getEditModalValues() {
     const nameInput = document.getElementById('editInputName').value;
     const priceInput = document.getElementById('editInputPrice').value;
     const buildVolumeInput = document.getElementById('editInputBuildVolume').value;
     const maxSpeedInput = document.getElementById('editInputMaxSpeed').value;
+    return {nameInput, priceInput, buildVolumeInput, maxSpeedInput};
+}
+
+function editPrinter(printerId) {
+    const {nameInput, priceInput, buildVolumeInput, maxSpeedInput} = getEditModalValues();
 
     fetch(`/printer/${printerId}`, {method: 'PUT', body: JSON.stringify({
             name: nameInput,
@@ -72,23 +92,14 @@ function editPrinter(printerId) {
                 document.getElementById(`printer${printer.id}:name`).textContent = printer.name;
                 document.getElementById(`printer${printer.id}:price`).textContent = printer.price;
                 document.getElementById(`printer${printer.id}:build_volume`).textContent = printer.build_volume;
+
                 document.getElementById(`printer${printer.id}:max_speed`).textContent = printer.max_speed;
 
                 const editButton = document.getElementById(`printer${printer.id}:editButton`);
-                editButton.onclick = function() {
-                    document.getElementById('editInputName').value = printer.name;
-                    document.getElementById('editInputPrice').value = printer.price;
-                    document.getElementById('editInputBuildVolume').value = printer.build_volume;
-                    document.getElementById('editInputMaxSpeed').value = printer.max_speed;
-                }
+                setEditButtonOnClick(editButton, printer);
 
                 const viewButton = document.getElementById(`printer${printer.id}:viewButton`);
-                viewButton.onclick = function() {
-                    document.getElementById('viewModalName').textContent = `Name: ${printer.name}`;
-                    document.getElementById('viewModalPrice').textContent = `Price: ${printer.price.toFixed(2)}$`;
-                    document.getElementById('viewModalBuildVolume').textContent = 'Build Volume: ' + printer.build_volume;
-                    document.getElementById('viewModalMaxSpeed').textContent = `Max Speed: ${printer.max_speed}mm/s`;
-                }
+                setViewButtonOnClick(viewButton, printer);
             });
         }
     });
@@ -102,20 +113,12 @@ function addEditButton(tableData, printer) {
     editButton.id = `printer${printer.id}:editButton`
     editButton.textContent = 'Edit';
 
-    editButton.onclick = function() {
-        document.getElementById('editInputName').value = printer.name;
-        document.getElementById('editInputPrice').value = printer.price;
-        document.getElementById('editInputBuildVolume').value = printer.build_volume;
-        document.getElementById('editInputMaxSpeed').value = printer.max_speed;
-
-        document.getElementById('editModalConfirm').setAttribute('onclick', `editPrinter(${printer.id})`);
-    }
+    setEditButtonOnClick(editButton, printer);
 
     tableData.appendChild(editButton);
 }
 
 function addTableActions(tableRow, printer) {
-
     const tableData = document.createElement('td');
 
     addViewButton(tableData, printer);
@@ -150,16 +153,25 @@ function loadTable() {
     });
 }
 
-function createPrinter() {
-    const nameInput = document.getElementById('inputName').value;
-    const priceInput = document.getElementById('inputPrice').value;
-    const buildVolumeInput = document.getElementById('inputBuildVolume').value;
-    const maxSpeedInput = document.getElementById('inputMaxSpeed').value;
-
+function clearCreateModalValues() {
     document.getElementById('inputName').value = '';
     document.getElementById('inputPrice').value = '';
     document.getElementById('inputBuildVolume').value = '';
     document.getElementById('inputMaxSpeed').value = '';
+}
+
+function getCreateModalValues() {
+    const nameInput = document.getElementById('inputName').value;
+    const priceInput = document.getElementById('inputPrice').value;
+    const buildVolumeInput = document.getElementById('inputBuildVolume').value;
+    const maxSpeedInput = document.getElementById('inputMaxSpeed').value;
+    return {nameInput, priceInput, buildVolumeInput, maxSpeedInput};
+}
+
+function createPrinter() {
+    const {nameInput, priceInput, buildVolumeInput, maxSpeedInput} = getCreateModalValues();
+
+    clearCreateModalValues();
 
     fetch('/printer', {method: 'POST', body: JSON.stringify({
             name: nameInput,