diff --git a/redirect.info b/redirect.info
old mode 100644
new mode 100755
index 6e5c110..1eb652d
--- a/redirect.info
+++ b/redirect.info
@@ -2,8 +2,8 @@ name = Redirect
 description = Allows users to redirect from old URLs to new URLs.
 core = 7.x
 files[] = redirect.controller.inc
-files[] = redirect.test
 files[] = redirect.migrate.inc
+files[] = redirect.test
 files[] = views/redirect.views.inc
 ;files[] = views/redirect_handler_field_redirect_type.inc
 files[] = views/redirect_handler_filter_redirect_type.inc
diff --git a/redirect.migrate.inc b/redirect.migrate.inc
old mode 100644
new mode 100755
index e657ad3..a215cbd
--- a/redirect.migrate.inc
+++ b/redirect.migrate.inc
@@ -24,13 +24,14 @@ class MigrateRedirectEntityHandler extends MigrateDestinationHandler {
   /**
    * Validates a redirect.
    *
-   * We need to check if a redirect already exists
-   * otherwise if we call redirect_save in complete we get an db
-   * error due to duplicate entries.
+   * We need to check if a redirect already exists. Calling redirect_save on an
+   * already existing redirect will throw a db error due to duplicate entries.
    *
-   * This function is similar to the validate function in the
-   * redirect module but the feedback is handled via the Migrate
-   * saveMessage functionality.
+   * This function is similar to the validate function in the redirect module
+   * but the feedback is handled via the Migrate's saveMessage functionality.
+   *
+   * @return bool
+   *   TRUE if the redirect is valid and can be saved.
    */
   protected function redirectValidate($redirect) {
     $redirect = (object) $redirect;
@@ -61,8 +62,7 @@ class MigrateRedirectEntityHandler extends MigrateDestinationHandler {
   protected function getRedirects($entity, $row) {
     // If there are multiple redirects defined for the entity, they will be in
     // $row. If there is just one, it will be in $entity.
-    $migrate_redirects = array();
-    if (isset($row->migrate_redirects) && !empty($row->migrate_redirects)) {
+    if (!empty($row->migrate_redirects)) {
       $migrate_redirects = $row->migrate_redirects;
     }
     else {
@@ -84,7 +84,6 @@ class MigrateRedirectEntityHandler extends MigrateDestinationHandler {
    *   The row being migrated.
    */
   public function complete($entity, stdClass $row) {
-
     $migration = Migration::currentMigration();
     $destination = $migration->getDestination();
     $entity_type = $destination->getEntityType();
@@ -99,14 +98,7 @@ class MigrateRedirectEntityHandler extends MigrateDestinationHandler {
         if (isset($entity->uid)) {
           $redirect_defaults['uid'] = $entity->uid;
         }
-        if (isset($entity->language)) {
-          if ($entity->language == '') {
-            $redirect_defaults['language'] = LANGUAGE_NONE;
-          }
-          else {
-            $redirect_defaults['language'] = $entity->language;
-          }
-        }
+        $redirect_defaults['language'] = empty($entity->language) ? LANGUAGE_NONE : $entity->language;
         $redirect = new stdClass();
         redirect_object_prepare($redirect, $redirect_defaults);
         $redirect->redirect = $redirect_destination['path'];