diff --git a/src/Pecee/CsrfToken.php b/src/Pecee/CsrfToken.php
index 3549243..0828279 100644
--- a/src/Pecee/CsrfToken.php
+++ b/src/Pecee/CsrfToken.php
@@ -15,7 +15,7 @@ class CsrfToken
      */
     public static function generateToken()
     {
-        if (function_exists('random_bytes')) {
+        if (function_exists('random_bytes') === true) {
             return bin2hex(random_bytes(32));
         }
 
@@ -46,6 +46,7 @@ class CsrfToken
 
     /**
      * Set csrf token cookie
+     * Overwrite this method to save the token to another storage like session etc.
      *
      * @param $token
      */
diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index dedf144..5c124d0 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
@@ -42,13 +43,7 @@ class Request
     {
         $this->headers = [];
 
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-            $key = $keys[$i];
-            $value = $_SERVER[$key];
-
+        foreach ($_SERVER as $key => $value) {
             $this->headers[strtolower($key)] = $value;
             $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
         }
@@ -167,24 +162,7 @@ class Request
      */
     public function getHeader($name, $defaultValue = null)
     {
-        if (array_key_exists(strtolower($name), $this->headers) === true) {
-            return $this->headers[strtolower($name)];
-        }
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $name = $_SERVER[$key];
-
-            if ($key === $name) {
-                return $name;
-            }
-        }
-
-        return $defaultValue;
+        return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
     }
 
     /**