diff --git a/src/Symfony/Components/CssSelector/Node/AttribNode.php b/src/Symfony/Components/CssSelector/Node/AttribNode.php
index ca698ea8f4..74a2862b5d 100644
--- a/src/Symfony/Components/CssSelector/Node/AttribNode.php
+++ b/src/Symfony/Components/CssSelector/Node/AttribNode.php
@@ -117,10 +117,8 @@ class AttribNode implements NodeInterface
     {
       return '@'.$this->attrib;
     }
-    else
-    {
-      return sprintf('@%s:%s', $this->namespace, $this->attrib);
-    }
+
+    return sprintf('@%s:%s', $this->namespace, $this->attrib);
   }
 
   protected function formatAttrib()
@@ -129,9 +127,7 @@ class AttribNode implements NodeInterface
     {
       return $this->attrib;
     }
-    else
-    {
-      return sprintf('%s|%s', $this->namespace, $this->attrib);
-    }
+
+    return sprintf('%s|%s', $this->namespace, $this->attrib);
   }
 }
diff --git a/src/Symfony/Components/CssSelector/Node/ElementNode.php b/src/Symfony/Components/CssSelector/Node/ElementNode.php
index aa5986ef22..9425de55a1 100644
--- a/src/Symfony/Components/CssSelector/Node/ElementNode.php
+++ b/src/Symfony/Components/CssSelector/Node/ElementNode.php
@@ -45,10 +45,8 @@ class ElementNode implements NodeInterface
     {
       return $this->element;
     }
-    else
-    {
-      return sprintf('%s|%s', $this->namespace, $this->element);
-    }
+
+    return sprintf('%s|%s', $this->namespace, $this->element);
   }
 
   public function toXpath()
diff --git a/src/Symfony/Components/CssSelector/Node/FunctionNode.php b/src/Symfony/Components/CssSelector/Node/FunctionNode.php
index 6908c61d1a..c7c18ae926 100644
--- a/src/Symfony/Components/CssSelector/Node/FunctionNode.php
+++ b/src/Symfony/Components/CssSelector/Node/FunctionNode.php
@@ -208,11 +208,13 @@ class FunctionNode implements NodeInterface
     {
       return array(2, 1);
     }
-    elseif ($s == 'even')
+
+    if ($s == 'even')
     {
       return array(2, 0);
     }
-    elseif ($s == 'n')
+
+    if ($s == 'n')
     {
       return array(1, 0);
     }
diff --git a/src/Symfony/Components/CssSelector/Parser.php b/src/Symfony/Components/CssSelector/Parser.php
index f355da85e6..5f00e7f714 100644
--- a/src/Symfony/Components/CssSelector/Parser.php
+++ b/src/Symfony/Components/CssSelector/Parser.php
@@ -104,10 +104,8 @@ class Parser
     {
       return $result[0];
     }
-    else
-    {
-      return new Node\OrNode($result);
-    }
+
+    return new Node\OrNode($result);
   }
 
   protected function parseSelector($stream)
diff --git a/src/Symfony/Components/CssSelector/TokenStream.php b/src/Symfony/Components/CssSelector/TokenStream.php
index 6c3c0cc1c5..e1774dd96e 100644
--- a/src/Symfony/Components/CssSelector/TokenStream.php
+++ b/src/Symfony/Components/CssSelector/TokenStream.php
@@ -52,18 +52,16 @@ class TokenStream
 
       return $this->peeked;
     }
-    else
+
+    if (!count($this->tokens))
     {
-      if (!count($this->tokens))
-      {
-        return null;
-      }
-
-      $next = array_shift($this->tokens);
-      $this->used[] = $next;
-
-      return $next;
+      return null;
     }
+
+    $next = array_shift($this->tokens);
+    $this->used[] = $next;
+
+    return $next;
   }
 
   public function peek()