diff --git a/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php
index 5dac8ccc6..82145d92c 100644
--- a/library/attach_mod/includes/functions_attach.php
+++ b/library/attach_mod/includes/functions_attach.php
@@ -196,9 +196,7 @@ function unlink_attach($filename, $mode = false)
         $filename = $upload_dir . '/' . $filename;
     }
 
-    $deleted = @unlink($filename);
-
-    return $deleted;
+    return @unlink($filename);
 }
 
 /**
diff --git a/library/attach_mod/includes/functions_filetypes.php b/library/attach_mod/includes/functions_filetypes.php
index 7d3ac79d6..aa7e06bef 100644
--- a/library/attach_mod/includes/functions_filetypes.php
+++ b/library/attach_mod/includes/functions_filetypes.php
@@ -49,9 +49,7 @@ function read_word($fp)
 {
     $data = fread($fp, 2);
 
-    $value = ord($data[1]) * 256 + ord($data[0]);
-
-    return $value;
+    return ord($data[1]) * 256 + ord($data[0]);
 }
 
 /**
@@ -61,9 +59,7 @@ function read_byte($fp)
 {
     $data = fread($fp, 1);
 
-    $value = ord($data);
-
-    return $value;
+    return ord($data);
 }
 
 /**
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 274e2032f..0953a4190 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1442,9 +1442,7 @@ function setup_style()
 
     require TEMPLATES_DIR . '/' . $tpl_dir_name . '/tpl_config.php';
 
-    $theme = array('template_name' => $tpl_dir_name);
-
-    return $theme;
+    return array('template_name' => $tpl_dir_name);
 }
 
 // Create date / time with format and friendly date