diff --git a/inc/security.php b/inc/security.php
index 2cbcd5a..8130798 100644
--- a/inc/security.php
+++ b/inc/security.php
@@ -25,8 +25,8 @@ remove_action( 'wp_head', 'wlwmanifest_link' );
 remove_action( 'wp_head', 'index_rel_link' );
 remove_action( 'wp_head', 'feed_links', 2 );
 remove_action( 'wp_head', 'feed_links_extra', 3 );
-remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
-remove_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
+remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10);
+remove_action( 'wp_head', 'wp_shortlink_wp_head', 10);
 
 /**
  * Show less info to users on failed login for security.
diff --git a/inc/theme-settings.php b/inc/theme-settings.php
index 47cacfa..16cf7db 100644
--- a/inc/theme-settings.php
+++ b/inc/theme-settings.php
@@ -5,25 +5,28 @@
  * @package understrap
  *
  */
-function setup_theme_default_settings() {
 
-	// check if settings are set, if not set defaults.
-	// Caution: DO NOT check existence using === always check with == .
-	// Latest blog posts style.
-	$understrap_posts_index_style = get_theme_mod( 'understrap_posts_index_style' );
-	if ( '' == $understrap_posts_index_style ) {
-		set_theme_mod( 'understrap_posts_index_style', 'default' );
-	}
+if ( ! function_exists( 'setup_theme_default_settings' ) ) :
+	function setup_theme_default_settings() {
 
-	// Sidebar position.
-	$understrap_sidebar_position = get_theme_mod( 'understrap_sidebar_position' );
-	if ( '' == $understrap_sidebar_position ) {
-		set_theme_mod( 'understrap_sidebar_position', 'right' );
-	}
+		// check if settings are set, if not set defaults.
+		// Caution: DO NOT check existence using === always check with == .
+		// Latest blog posts style.
+		$understrap_posts_index_style = get_theme_mod( 'understrap_posts_index_style' );
+		if ( '' == $understrap_posts_index_style ) {
+			set_theme_mod( 'understrap_posts_index_style', 'default' );
+		}
 
-	// Container width.
-	$understrap_container_type = get_theme_mod( 'understrap_container_type' );
-	if ( '' == $understrap_container_type ) {
-		set_theme_mod( 'understrap_container_type', 'container' );
+		// Sidebar position.
+		$understrap_sidebar_position = get_theme_mod( 'understrap_sidebar_position' );
+		if ( '' == $understrap_sidebar_position ) {
+			set_theme_mod( 'understrap_sidebar_position', 'right' );
+		}
+
+		// Container width.
+		$understrap_container_type = get_theme_mod( 'understrap_container_type' );
+		if ( '' == $understrap_container_type ) {
+			set_theme_mod( 'understrap_container_type', 'container' );
+		}
 	}
-}
+endif;