diff --git a/dbtng_example/dbtng_example.install b/dbtng_example/dbtng_example.install
index dda29aa..886cc07 100644
--- a/dbtng_example/dbtng_example.install
+++ b/dbtng_example/dbtng_example.install
@@ -7,7 +7,7 @@
 /**
  * Implements hook_install().
  *
- * We will create a default entry in the database.
+ * Creates some default entries on this module custom table.
  *
  * @see hook_install()
  * @ingroup dbtng_example
@@ -40,22 +40,11 @@ function dbtng_example_install() {
 }
 
 /**
- * Implements hook_uninstall().
- *
- * @see hook_uninstall()
- * @ingroup dbtng_example
- */
-function dbtng_example_uninstall() {
-  // Nothing.
-}
-
-
-/**
  * Implements hook_schema().
  *
  * Defines the database tables used by this module.
  * Remember that the easiest way to create the code for hook_schema is with
- * the @link http://drupal.org/project/schema schema module @endlink
+ * the @link http://drupal.org/project/schema schema module @endlink.
  *
  * @see hook_schema()
  * @ingroup dbtng_example
diff --git a/dbtng_example/dbtng_example.module b/dbtng_example/dbtng_example.module
index 6a44b53..bc627f6 100644
--- a/dbtng_example/dbtng_example.module
+++ b/dbtng_example/dbtng_example.module
@@ -404,14 +404,14 @@ function dbtng_example_form_add($form, &$form_state) {
  * Submit handler for 'add entry' form.
  */
 function dbtng_example_form_add_submit($form, &$form_state) {
-  global $user;
+  $account = \Drupal::request()->attributes->get('_account');
 
   // Save the submitted entry.
   $entry = array(
     'name'    => $form_state['values']['name'],
     'surname' => $form_state['values']['surname'],
     'age'     => $form_state['values']['age'],
-    'uid'     => $user->uid,
+    'uid'     => $account->id(),
   );
   $return = dbtng_example_entry_insert($entry);
   if ($return) {
@@ -504,7 +504,7 @@ function dbtng_example_form_update_callback($form, $form_state) {
  * Submit handler for 'update entry' form.
  */
 function dbtng_example_form_update_submit($form, &$form_state) {
-  global $user;
+  $account = \Drupal::request()->attributes->get('_account');
 
   // Save the submitted entry.
   $entry = array(
@@ -512,7 +512,7 @@ function dbtng_example_form_update_submit($form, &$form_state) {
     'name' => $form_state['values']['name'],
     'surname' => $form_state['values']['surname'],
     'age' => $form_state['values']['age'],
-    'uid' => $user->uid,
+    'uid' => $account->id(),
   );
   $count = dbtng_example_entry_update($entry);
   drupal_set_message(t('Updated entry @entry (@count row updated)', array('@count' => $count, '@entry' => print_r($entry, TRUE))));
diff --git a/dbtng_example/lib/Drupal/dbtng_example/Tests/DBTNGExampleTest.php b/dbtng_example/lib/Drupal/dbtng_example/Tests/DBTNGExampleTest.php
index d642839..b6ced5a 100644
--- a/dbtng_example/lib/Drupal/dbtng_example/Tests/DBTNGExampleTest.php
+++ b/dbtng_example/lib/Drupal/dbtng_example/Tests/DBTNGExampleTest.php
@@ -1,14 +1,14 @@
 <?php
 /**
  * @file
- * SimpleTests for dbtng_example module.
+ * Contains DBTNGExampleTest.
  */
 
 namespace Drupal\dbtng_example\Tests;
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Default test case for the dbtng_example module.
+ * Tests for the dbtng_example module.
  */
 class DBTNGExampleTest extends WebTestBase {
   public static $modules = array('dbtng_example');
@@ -22,7 +22,7 @@ class DBTNGExampleTest extends WebTestBase {
   }
 
   /**
-   * Test default module installation, two entries in the database table.
+   * Assert that two entries were inserted at install.
    */
   function testInstall() {
     $result = dbtng_example_entry_load();
@@ -33,7 +33,6 @@ class DBTNGExampleTest extends WebTestBase {
     );
   }
 
-
   /**
    * Test the UI.
    */