diff --git a/functions.php b/functions.php
index 338b6b0..c489399 100644
--- a/functions.php
+++ b/functions.php
@@ -48,7 +48,7 @@ require get_template_directory() . '/inc/extras.php';
 require get_template_directory() . '/inc/customizer.php';
 
 /**
- * Customizer additions.
+ * Custom Comments file.
  */
 require get_template_directory() . '/inc/custom-comments.php';
 
diff --git a/inc/enqueue.php b/inc/enqueue.php
index bdad86c..584bb6e 100644
--- a/inc/enqueue.php
+++ b/inc/enqueue.php
@@ -14,7 +14,7 @@ if ( ! function_exists( 'understrap_scripts' ) ) {
 		$the_theme = wp_get_theme();
 		wp_enqueue_style( 'understrap-styles', get_stylesheet_directory_uri() . '/css/theme.min.css', array(), $the_theme->get( 'Version' ) );
 		wp_enqueue_script( 'jquery' );
-		wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), false);
+		wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), false );
 		wp_enqueue_script( 'understrap-scripts', get_template_directory_uri() . '/js/theme.min.js', array(), $the_theme->get( 'Version' ), true );
 		if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 			wp_enqueue_script( 'comment-reply' );
diff --git a/inc/setup.php b/inc/setup.php
index 5e8e456..9292fca 100644
--- a/inc/setup.php
+++ b/inc/setup.php
@@ -85,7 +85,7 @@ if ( ! function_exists( 'understrap_setup' ) ) :
 			'default-image' => '',
 		) ) );
 
-		// Set up the Wordpress Theme logo feature.
+		// Set up the WordPress Theme logo feature.
 		add_theme_support( 'custom-logo' );
 
 		// Check and setup theme default settings.
diff --git a/languages/es_ES.po b/languages/es_ES.po
index 24c843c..8cb5efd 100644
--- a/languages/es_ES.po
+++ b/languages/es_ES.po
@@ -297,7 +297,7 @@ msgid ""
 "or as parent theme. It is up to you."
 msgstr ""
 "Una combinacion de tema _s  (Automattic) y de Bootstrap 4. Realizado solidamente "
-"Punto de partida para tus proyectos hechos en Wordpress. Utilizar Empezar como "
+"Punto de partida para tus proyectos hechos en WordPress. Utilizar Empezar como "
 "padre tema de tus temas, es tu decisión."
 
 #. Author of the theme
diff --git a/languages/sv_SE.po b/languages/sv_SE.po
index 05a6f6a..a4250e4 100644
--- a/languages/sv_SE.po
+++ b/languages/sv_SE.po
@@ -252,7 +252,7 @@ msgctxt "noun"
 msgid "Comment"
 msgstr "Kommentarer"
 
-#: ../loop-templates/content-single.php:29 ../loop-templates/content.php:33 .. 
+#: ../loop-templates/content-single.php:29 ../loop-templates/content.php:33 ..
 #: loop-templates/content-page.php:25
 msgid "Pages:"
 msgstr "Sidor:"
@@ -385,7 +385,7 @@ msgid ""
 "starter theme or as parent theme. It is up to you."
 msgstr ""
 "En kombination av Automattic´s _s tema och Bootstrap 4. Gjort som en bas för "
-"ditt nästa tema eller Wordpress webbplats. Använd det som en grund eller som "
+"ditt nästa tema eller WordPress webbplats. Använd det som en grund eller som "
 "ett förälder tema. Det är upp till dig."
 
 #. Author of the theme
diff --git a/package.json b/package.json
index 3395910..7ca2215 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "understrap",
   "version": "0.6.5",
-  "description": "Wordpress Theme framework",
+  "description": "WordPress Theme framework",
   "main": "index.js",
   "scripts": {
     "postinstall": "gulp copy-assets"
diff --git a/sass/understrap/understrap.scss b/sass/understrap/understrap.scss
index c0a5ca7..0b33115 100644
--- a/sass/understrap/understrap.scss
+++ b/sass/understrap/understrap.scss
@@ -1,15 +1,15 @@
 // Some basic padding for all wrappers
-.wrapper { 
+.wrapper {
   padding: $grid-gutter-width 0; }
 
 // Reset hero wrapper padding to 0
 #wrapper-hero { padding: 0px !important; }
 
-// Adding basic Wordpress classes to pass the Wordpress.org tests
+// Adding basic WordPress classes to pass the WordPress.org tests
 .sticky,
 .gallery-caption,
-.bypostauthor { 
-  font-size: inherit; 
+.bypostauthor {
+  font-size: inherit;
 }
 
 // Separate sticky wrapper from main content