diff --git a/client/src/assets/icons/CertificationIcon.js b/client/src/assets/icons/CertificationIcon.js
index 00aeff4406..0d7dc9edb3 100644
--- a/client/src/assets/icons/CertificationIcon.js
+++ b/client/src/assets/icons/CertificationIcon.js
@@ -16,11 +16,11 @@ function CertificationIcon() {
         <path
           d='M239 303.14L310.43 248.57L381.86 303.14L354.57 391.43L266.28 391.43L239 303.14Z'
           id='aZt9D86Ps'
-        ></path>
+        />
         <path
           d='M327.11 393.59L344.3 496.78L309.91 479.58L275.51 496.78L292.71 393.59L327.11 393.59Z'
           id='b7LyrCUAE'
-        ></path>
+        />
       </defs>
       <g>
         <g>
@@ -29,7 +29,7 @@ function CertificationIcon() {
             fillOpacity='0'
             opacity='1'
             xlinkHref='#aZt9D86Ps'
-          ></use>
+          />
           <g>
             <use
               fillOpacity='0'
@@ -38,7 +38,7 @@ function CertificationIcon() {
               strokeOpacity='1'
               strokeWidth='14'
               xlinkHref='#aZt9D86Ps'
-            ></use>
+            />
           </g>
         </g>
         <g>
@@ -47,7 +47,7 @@ function CertificationIcon() {
             fillOpacity='0'
             opacity='1'
             xlinkHref='#b7LyrCUAE'
-          ></use>
+          />
           <g>
             <use
               fillOpacity='0'
@@ -56,7 +56,7 @@ function CertificationIcon() {
               strokeOpacity='1'
               strokeWidth='14'
               xlinkHref='#b7LyrCUAE'
-            ></use>
+            />
           </g>
         </g>
       </g>
diff --git a/client/src/client-only-routes/ShowSettings.js b/client/src/client-only-routes/ShowSettings.js
index bd0db6cc84..e6ade34b0f 100644
--- a/client/src/client-only-routes/ShowSettings.js
+++ b/client/src/client-only-routes/ShowSettings.js
@@ -173,7 +173,7 @@ export function ShowSettings(props) {
 
   return (
     <Fragment>
-      <Helmet title='Settings | freeCodeCamp.org'></Helmet>
+      <Helmet title='Settings | freeCodeCamp.org' />
       <Grid>
         <main>
           <Spacer size={2} />
diff --git a/client/src/components/Flash/index.js b/client/src/components/Flash/index.js
index 6628ba3b4b..eb6e4bcdb8 100644
--- a/client/src/components/Flash/index.js
+++ b/client/src/components/Flash/index.js
@@ -42,7 +42,7 @@ function Flash({ flashMessage, onClose }) {
           style={{
             height: flashMessageHeight + 'px'
           }}
-        ></div>
+        />
       )}
     </>
   );
diff --git a/client/src/components/Footer/index.js b/client/src/components/Footer/index.js
index 56c6ef210b..d5946ef9fb 100644
--- a/client/src/components/Footer/index.js
+++ b/client/src/components/Footer/index.js
@@ -294,7 +294,7 @@ function Footer() {
         </div>
         <div className='footer-buttom'>
           <div className='col-header'>Our Nonprofit</div>
-          <div className='footer-divder'></div>
+          <div className='footer-divder' />
           <div className='our-nonprofit'>
             <Link
               external={false}
diff --git a/client/src/components/layouts/Certification.js b/client/src/components/layouts/Certification.js
index 25b43c7acc..1bb2702b80 100644
--- a/client/src/components/layouts/Certification.js
+++ b/client/src/components/layouts/Certification.js
@@ -29,7 +29,7 @@ class CertificationLayout extends Component {
 
     return (
       <Fragment>
-        <Helmet bodyAttributes={{ class: 'light-palette' }}></Helmet>
+        <Helmet bodyAttributes={{ class: 'light-palette' }} />
         {children}
       </Fragment>
     );
diff --git a/client/src/templates/Challenges/components/PrismFormatted.js b/client/src/templates/Challenges/components/PrismFormatted.js
index 9c4aa4d077..1cf60a2812 100644
--- a/client/src/templates/Challenges/components/PrismFormatted.js
+++ b/client/src/templates/Challenges/components/PrismFormatted.js
@@ -27,7 +27,7 @@ class PrismFormatted extends Component {
         className={className}
         dangerouslySetInnerHTML={{ __html: text }}
         ref={this.instructionsRef}
-      ></div>
+      />
     );
   }
 }
diff --git a/client/src/templates/Challenges/video/Show.js b/client/src/templates/Challenges/video/Show.js
index 5b27aed1b3..a6a11ba000 100644
--- a/client/src/templates/Challenges/video/Show.js
+++ b/client/src/templates/Challenges/video/Show.js
@@ -243,7 +243,7 @@ export class Project extends Component {
                         />{' '}
                         <span className='video-quiz-input-visible'>
                           {this.state.selectedOption === index ? (
-                            <span className='video-quiz-selected-input'></span>
+                            <span className='video-quiz-selected-input' />
                           ) : null}
                         </span>
                         <PrismFormatted