diff --git a/cmd/templates/create-react-app/frontend/src/components/HelloWorld.js b/cmd/templates/create-react-app/frontend/src/components/HelloWorld.js
index 580dfd851..26be1aea1 100644
--- a/cmd/templates/create-react-app/frontend/src/components/HelloWorld.js
+++ b/cmd/templates/create-react-app/frontend/src/components/HelloWorld.js
@@ -2,34 +2,34 @@ import React, { useState } from 'react';
 import Modal from 'react-modal';
 
 function HelloWorld() {
-  const [showModal, setShowModal] = useState(false);
-  const [result, setResult] = useState(null);
+	const [showModal, setShowModal] = useState(false);
+	const [result, setResult] = useState(null);
 
-  const handleOpenModal = () => {
-    setShowModal(true);
+	const handleOpenModal = () => {
+		setShowModal(true);
 
-    window.backend.basic().then((result) => setResult(result));
-  };
+		window.backend.basic().then((result) => setResult(result));
+	};
 
-  const handleCloseModal = () => {
-    setShowModal(false);
-  };
+	const handleCloseModal = () => {
+		setShowModal(false);
+	};
 
-  return (
-    <div className="App">
-      <button onClick={() => handleOpenModal()} type="button">
-        Hello
+	return (
+		<div className="App">
+			<button onClick={() => handleOpenModal()} type="button">
+				Hello
       </button>
-      <Modal
-        appElement={document.getElementById("app")}
-        isOpen={showModal}
-        contentLabel="Minimal Modal Example"
-      >
-        <p>{result}</p>
-        <button onClick={() => handleCloseModal()}>Close Modal</button>
-      </Modal>
-    </div>
-  );
+			<Modal
+				appElement={document.getElementById("app")}
+				isOpen={showModal}
+				contentLabel="Minimal Modal Example"
+			>
+				<p>{result}</p>
+				<button onClick={() => handleCloseModal()}>Close Modal</button>
+			</Modal>
+		</div>
+	);
 }
 
 export default HelloWorld;
diff --git a/cmd/templates/create-react-app/frontend/src/serviceWorker.js b/cmd/templates/create-react-app/frontend/src/serviceWorker.js
index b04b771a8..f8c7e50c2 100644
--- a/cmd/templates/create-react-app/frontend/src/serviceWorker.js
+++ b/cmd/templates/create-react-app/frontend/src/serviceWorker.js
@@ -14,7 +14,7 @@ const isLocalhost = Boolean(
   window.location.hostname === 'localhost' ||
     // [::1] is the IPv6 localhost address.
     window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
+    // 127.0.0.1/8 is considered localhost for IPv4.
     window.location.hostname.match(
       /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
     )
@@ -100,9 +100,7 @@ function registerValidSW(swUrl, config) {
 
 function checkValidServiceWorker(swUrl, config) {
   // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
-  })
+  fetch(swUrl)
     .then(response => {
       // Ensure service worker exists, and that we really are getting a JS file.
       const contentType = response.headers.get('content-type');
@@ -130,12 +128,8 @@ function checkValidServiceWorker(swUrl, config) {
 
 export function unregister() {
   if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready
-      .then(registration => {
-        registration.unregister();
-      })
-      .catch(error => {
-        console.error(error.message);
-      });
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
   }
 }