diff --git a/prepopulate.module b/prepopulate.module
index 560cdae..f6b98ce 100644
--- a/prepopulate.module
+++ b/prepopulate.module
@@ -9,6 +9,7 @@
  * http://www.drupal.org/node/27155.
  */
 
+use Drupal\prepopulate\Controller\prepopulateController;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -20,7 +21,7 @@ function prepopulate_form_alter(&$form, FormStateInterface $form_state, $form_id
   if (!empty($form_state->rebuild_info)) {
     return;
   }
-  if (isset($_REQUEST['edit'])) {
+  if (\Drupal::request()->get('edit') !== NULL) {
     $form['#after_build'][] = 'prepopulate_after_build';
   }
 }
@@ -29,12 +30,10 @@ function prepopulate_form_alter(&$form, FormStateInterface $form_state, $form_id
  * An #after_build function to set the values prepopulated in the request.
  */
 function prepopulate_after_build($form) {
-  if (isset($_REQUEST['edit'])) {
-    $request = (array) $_REQUEST['edit'];
-    $prepopulateController = new \Drupal\prepopulate\Controller\prepopulateController();
+  if (\Drupal::request()->get('edit') !== NULL) {
+    $request = (array) \Drupal::request()->get('edit');
+    $prepopulateController = new prepopulateController();
     $prepopulateController->_prepopulate_request_walk($form, $request);
   }
   return $form;
 }
-
-
diff --git a/src/Controller/prepopulateController.php b/src/Controller/prepopulateController.php
index 48a8bfc..a359644 100644
--- a/src/Controller/prepopulateController.php
+++ b/src/Controller/prepopulateController.php
@@ -1,21 +1,24 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\prepopulate\Controller.
- */
-
 namespace Drupal\prepopulate\Controller;
 
+use Drupal\node\Entity\Node;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Render\Element;
 use Drupal;
 
-
+/**
+ * Class prepopulateController.
+ */
 class prepopulateController extends ControllerBase {
+
+  /**
+   * prepopulateController constructor.
+   */
   public function __construct() {
     $this->database = Drupal::database();
   }
+
   /**
     * Internal helper to set element values from the $_REQUEST variable.
     *
@@ -24,7 +27,7 @@ public function __construct() {
     * @param mixed &$request_slice
     *   String or array. Value(s) to be applied to the element.
    */
-  function _prepopulate_request_walk(&$form, &$request_slice) {
+  public function _prepopulate_request_walk(&$form, &$request_slice) {
     $limited_types = [
       'actions',
       'button',
@@ -50,7 +53,7 @@ function _prepopulate_request_walk(&$form, &$request_slice) {
           elseif (isset($form[$request_variable]['widget']['#type'])) {
             $type = $form[$request_variable]['widget']['#type'];
           }
-          
+
           if (Element::child($request_variable) && !empty($form[$request_variable]) && (!isset($type) || !in_array($type, $limited_types))) {
             if (!isset($form[$request_variable]['#access']) || $form[$request_variable]['#access'] != FALSE) {
               $this->_prepopulate_request_walk($form[$request_variable], $request_slice[$request_variable]);
@@ -71,7 +74,7 @@ function _prepopulate_request_walk(&$form, &$request_slice) {
         else {
           if (isset($form['widget'][0]['target_id'])) {
             // Referenced element: look for name ? Title (id)
-            if (is_numeric($request_slice) && ($target_node = \Drupal\node\Entity\Node::load($request_slice)) && $target_node->access('view')) {
+            if (is_numeric($request_slice) && ($target_node = Node::load($request_slice)) && $target_node->access('view')) {
               $form['widget'][0]['target_id']['#value'] = $target_node->getTitle() . ' (' . $request_slice . ')';
             }
             else {
@@ -86,4 +89,5 @@ function _prepopulate_request_walk(&$form, &$request_slice) {
       }
     }
   }
+
 }
