diff --git a/replicate.drush.inc b/replicate.drush.inc
index 4e3b83c..0a3c222 100644
--- a/replicate.drush.inc
+++ b/replicate.drush.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Implements hook_drush_command().
  */
@@ -9,11 +8,10 @@ function replicate_drush_command() {
     'description' => 'Replicate an Enitity via Drush!',
     'arguments' => array(
       'entity-type' => dt('Type of Entity (eg. Node) that you wish to replicate'),
-    ),
-    'arguments' => array(
       'id-number' => dt('ID value of the specified Entity Type (eg. NodeID'),
+
     ),
-    'aliases' => array('drep'),
+    'aliases' => array('rep', 'replicate'),
     'examples' => array(
       'drush replicate node 1' =>
         'Node 1 is replicated via drush using full command',
@@ -24,61 +22,25 @@ function replicate_drush_command() {
 
   return $items;
 }
-
-function drush_replicate_drush_help($command) {
+/**
+ * Implements hook_drush_help().
+ */
+function replicate_drush_help($command) {
   switch ($command) {
-    case 'drush:my-command':
-
-      return dt('Run my command');
+    case 'drush:replicate-drush-entity-by-id':
+      return dt('This allows a user to replicate an entity by providing an entity type and id.');
   }
 }
-
-function drush_replicate_drush_entity_by_id($entity_type, $id) {
-  
-  if(!$info = entity_get_info($entity_type)){
-      drush_print('Entity does not exist! Please enter a valid entity type and number!');
-
-      return FALSE;
-  }
-  $original = entity_load_single($entity_type, $id);
-
-  return drush_replicate_drush_entity($entity_type, $original);
-}
-
-function drush_replicate_drush_entity($entity_type, $entity) {
-  if($entity && $entity_type){
-    $clone = drush_replicate_replicate_clone_entity($entity_type, $entity);
-    if ($clone) {
-      entity_save($entity_type, $clone);
-      list($entity_id) = entity_extract_ids($entity_type, $clone);
-      if (isset($entity_id)) {
-        $returnvalue = "Congratulations your cloned " . $entity_type . " is " . $entity_type . " " . $entity_id;
-
-        return drush_print($returnvalue);
-      }
+/**
+ * Implements replicate_entity_by_id().
+ */
+function drush_replicate_drush_entity_by_id($entity_type = NULL, $id = NULL) {
+  if (!is_null($entity_type) && !is_null($id) ){
+    $entity_id = replicate_entity_by_id($entity_type, $id);
+    if (isset($entity_id)) {
+      $returnvalue = "Congratulations your cloned " . $entity_type . " is " . $entity_type . " " . $entity_id;
+      return drush_print($returnvalue);
     }
   }
-  drush_print('Entity does not exist! Please enter a valid entity type and number!');
-
-  return FALSE;
+  return "Missing Arguments! Please enter a valid entity type and number!";
 }
-
-function drush_replicate_replicate_clone_entity($entity_type, $entity) {
-  $clone = clone($entity);
-
-  if ($clone) {
-    // Let other modules manage the cleaning of the entity.
-    foreach (module_implements('replicate_entity_' . $entity_type) as $module) {
-      $function = $module . '_replicate_entity_' . $entity_type;
-      $function($clone);
-    }
-    // Set the entity as new entity.
-    $clone->is_new = TRUE;
-    // Let other modules do special actions on each field.
-    replicate_clone_fields($clone, $entity_type);
-    // Let other modules do special actions on the global entity.
-    drupal_alter('replicate_entity', $clone, $entity_type, $entity);
-  }
-
-  return $clone;
-}
\ No newline at end of file