diff --git a/bin/create-single-file b/bin/create-single-file
index 7537729b..ecb876b0 100755
--- a/bin/create-single-file
+++ b/bin/create-single-file
@@ -19,7 +19,7 @@
 // files, but namespaces and classes definitions must follow a precise order
 // when dealing with subclassing and inheritance.
 //
-// The current implementation is pretty naïve, but it should do for now.
+// The current implementation is pretty naïve, but it should do for now.
 // -------------------------------------------------------------------------- //
 
 class CommandLine
@@ -27,10 +27,10 @@ class CommandLine
     public static function getOptions()
     {
         $parameters = array(
-            's:'  => 'source:',
-            'o:'  => 'output:',
-            'e:'  => 'exclude:',
-            'E:'  => 'exclude-classes:',
+            's:' => 'source:',
+            'o:' => 'output:',
+            'e:' => 'exclude:',
+            'E:' => 'exclude-classes:',
         );
 
         $getops = getopt(implode(array_keys($parameters)), $parameters);
diff --git a/src/Profile/Factory.php b/src/Profile/Factory.php
index b1ff7fa0..bcee3c2c 100644
--- a/src/Profile/Factory.php
+++ b/src/Profile/Factory.php
@@ -27,8 +27,8 @@ final class Factory
         '2.6' => 'Predis\Profile\RedisVersion260',
         '2.8' => 'Predis\Profile\RedisVersion280',
         '3.0' => 'Predis\Profile\RedisVersion300',
-        'default' => 'Predis\Profile\RedisVersion300',
         'dev' => 'Predis\Profile\RedisUnstable',
+        'default' => 'Predis\Profile\RedisVersion300',
     );
 
     /**
diff --git a/src/PubSub/AbstractConsumer.php b/src/PubSub/AbstractConsumer.php
index 250eca5c..d7423f1e 100644
--- a/src/PubSub/AbstractConsumer.php
+++ b/src/PubSub/AbstractConsumer.php
@@ -18,16 +18,16 @@ namespace Predis\PubSub;
  */
 abstract class AbstractConsumer implements \Iterator
 {
-    const SUBSCRIBE = 'subscribe';
-    const UNSUBSCRIBE = 'unsubscribe';
-    const PSUBSCRIBE = 'psubscribe';
+    const SUBSCRIBE    = 'subscribe';
+    const UNSUBSCRIBE  = 'unsubscribe';
+    const PSUBSCRIBE   = 'psubscribe';
     const PUNSUBSCRIBE = 'punsubscribe';
-    const MESSAGE = 'message';
-    const PMESSAGE = 'pmessage';
-    const PONG = 'pong';
+    const MESSAGE      = 'message';
+    const PMESSAGE     = 'pmessage';
+    const PONG         = 'pong';
 
-    const STATUS_VALID = 1;    // 0b0001
-    const STATUS_SUBSCRIBED = 2;    // 0b0010
+    const STATUS_VALID       = 1;    // 0b0001
+    const STATUS_SUBSCRIBED  = 2;    // 0b0010
     const STATUS_PSUBSCRIBED = 4;    // 0b0100
 
     private $position = null;
diff --git a/src/Transaction/MultiExecState.php b/src/Transaction/MultiExecState.php
index 4bed42af..a0a82852 100644
--- a/src/Transaction/MultiExecState.php
+++ b/src/Transaction/MultiExecState.php
@@ -20,9 +20,9 @@ class MultiExecState
 {
     const INITIALIZED = 1;    // 0b00001
     const INSIDEBLOCK = 2;    // 0b00010
-    const DISCARDED = 4;    // 0b00100
-    const CAS = 8;    // 0b01000
-    const WATCH = 16;   // 0b10000
+    const DISCARDED   = 4;    // 0b00100
+    const CAS         = 8;    // 0b01000
+    const WATCH       = 16;   // 0b10000
 
     private $flags;