diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index 637b744b5..039469920 100644
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
@@ -127,13 +127,14 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const
     mc_skin_color_t *mc_skin_color, *tmp;
 
     values = mc_config_get_string_list (mc_skin->config, group, key, &items_count);
-
-    if (values == NULL || *values == NULL)
+    if (values == NULL)
+        return NULL;
+    if (*values == NULL)
     {
-        if (values != NULL)
-            g_strfreev (values);
+        g_strfreev (values);
         return NULL;
     }
+
     mc_skin_color = g_try_new0 (mc_skin_color_t, 1);
     if (mc_skin_color == NULL)
     {
@@ -145,7 +146,7 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const
     {
     case 0:
         tmp = mc_skin_color_get_with_defaults (group, "_default_");
-        if (tmp)
+        if (tmp != NULL)
         {
             mc_skin_color->fgcolor = g_strdup (tmp->fgcolor);
             mc_skin_color->bgcolor = g_strdup (tmp->bgcolor);
@@ -330,13 +331,7 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin)
         if (keys == NULL)
             continue;
 
-        if (*keys == NULL)
-        {
-            g_strfreev (keys);
-            continue;
-        }
-
-        for (; *keys; keys++)
+        for (; *keys != NULL; keys++)
         {
             mc_skin_color = mc_skin_color_get_from_ini_file (mc_skin, *groups, *keys);
             if (mc_skin_color != NULL)
diff --git a/lib/skin/common.c b/lib/skin/common.c
index c16966bbb..3d727202b 100644
--- a/lib/skin/common.c
+++ b/lib/skin/common.c
@@ -48,14 +48,6 @@ static gboolean mc_skin_is_init = FALSE;
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-static inline void
-mc_skin_hash_destroy_key (gpointer data)
-{
-    g_free (data);
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
 static void
 mc_skin_hash_destroy_value (gpointer data)
 {
@@ -93,7 +85,7 @@ mc_skin_reinit (void)
     mc_skin_deinit ();
     mc_skin__default.name = mc_skin_get_default_name ();
     mc_skin__default.colors = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                     mc_skin_hash_destroy_key,
+                                                     g_free,
                                                      mc_skin_hash_destroy_value);
 }
 
@@ -124,7 +116,7 @@ mc_skin_init (GError ** error)
     mc_skin__default.name = mc_skin_get_default_name ();
 
     mc_skin__default.colors = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                     mc_skin_hash_destroy_key,
+                                                     g_free,
                                                      mc_skin_hash_destroy_value);
 
     if (!mc_skin_ini_file_load (&mc_skin__default)) {