diff --git a/disable_messages.module b/disable_messages.module
index 6c39e82..6d5c48d 100644
--- a/disable_messages.module
+++ b/disable_messages.module
@@ -62,6 +62,9 @@ function disable_messages_preprocess_status_messages(&$variables) {
 
 /**
  * Apply the filters to the messages.
+ *
+ * @param string $messages
+ * @return mixed
  */
 function disable_messages_apply_filters($messages) {
   $user = \Drupal::currentUser();
@@ -147,6 +150,9 @@ function disable_messages_apply_filters($messages) {
 
 /**
  * Cache messages for debug purposes.
+ *
+ * @param string $messages
+ * @return string
  */
 function disable_messages_cache_messages($messages = NULL) {
   static $cache;
@@ -160,6 +166,11 @@ function disable_messages_cache_messages($messages = NULL) {
  * Custom error handler.
  *
  * To catch the preg error while validating the regular expressions.
+ *
+ * @param $errno
+ * @param $errstr
+ * @param $errfile
+ * @param $errline
  */
 function _disable_messages_error_handler($errno, $errstr, $errfile, $errline) {
   global $_disable_messages_error, $_disable_messages_error_no;
@@ -185,7 +196,10 @@ function disable_messages_page_alter(&$page) {
  * Pre render function to render the debug output into the page footer.
  *
  * A separate pre-render function is required because the messages
- * wouldn't yet be processed by the time page_alter is called.
+ * would not yet be processed by the time page_alter is called.
+ *
+ * @param string $elements
+ * @return mixed
  */
 function disable_message_pre_render_debug_output(&$elements) {
   $style = '';
diff --git a/src/Form/DisableMessagesSettingsForm.php b/src/Form/DisableMessagesSettingsForm.php
index 2f13703..16a6ffb 100644
--- a/src/Form/DisableMessagesSettingsForm.php
+++ b/src/Form/DisableMessagesSettingsForm.php
@@ -9,6 +9,7 @@ namespace Drupal\disable_messages\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
 use Drupal\Core\Url;
 
 /**
@@ -27,10 +28,6 @@ class DisableMessagesSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Catch comma typos in the id text box.
-    $value = $form_state->getValue('disable_messages_exclude_users');
-    $value = preg_replace(array('/[^0-9,]/', '/^,*/', '/,*$/'), '', $value);
-    $value = preg_replace('/(,+)/', ',', $value);
     // Process and save the regular expressions in another variable.
     $patterns = explode("\n", $form_state->getValue('disable_messages_ignore_patterns'));
     $regexps = array();
@@ -71,7 +68,7 @@ class DisableMessagesSettingsForm extends ConfigFormBase {
     $form['disable_messages_ignore_patterns'] = array(
       '#type' => 'textarea',
       '#title' => t('Messages to be disabled'),
-      '#description' => t('Enter messages that should not be shown to end users. Regular expressions are supported. You do not have to include the opening and closing forward slashes for the regular expression. The system will automatically add /^ and $/ at the beginning and end of the pattern to ensure that the match is always a full match instead of a partial match. This will help prevent unexpected filtering of messages. So if you want to filter out a specific message ensure that you add the full message including any punctuation and additional HTML if any. Add one per line. See @PCRE documentation for details on regular expressions.', array('@PCRE' => \Drupal::l('PCRE', Url::fromUri('http://us3.php.net/manual/en/book.pcre.php')))),
+      '#description' => t('Enter messages that should not be shown to end users. Regular expressions are supported. You do not have to include the opening and closing forward slashes for the regular expression. The system will automatically add /^ and $/ at the beginning and end of the pattern to ensure that the match is always a full match instead of a partial match. This will help prevent unexpected filtering of messages. So if you want to filter out a specific message ensure that you add the full message including any punctuation and additional HTML if any. Add one per line. See @PCRE documentation for details on regular expressions.', array('@PCRE' => Link::fromTextAndUrl('PCRE', Url::fromUri('http://us3.php.net/manual/en/book.pcre.php')))),
       '#default_value' => \Drupal::config('disable_messages.settings')->get('disable_messages_ignore_patterns'),
     );
     $form['disable_messages_ignore_case'] = array(
@@ -89,7 +86,7 @@ class DisableMessagesSettingsForm extends ConfigFormBase {
     $form['disable_messages_filter_options']['role_information'] = array(
       '#type' => 'item',
       '#title' => t('Filering by role'),
-      '#markup' => t('By default, permission to view all message types are given for all roles. You can change this in @link to limit the roles which can view a given message type.', array('@link' => \Drupal::l('administer permissions', Url::fromRoute('user.admin_permissions')))),
+      '#markup' => t('By default, permission to view all message types are given for all roles. You can change this in @link to limit the roles which can view a given message type.', array('@link' => Link::fromTextAndUrl('administer permissions', Url::fromRoute('user.admin_permissions')))),
     );
     $options = array(
       t('Apply filters on all pages.'),
@@ -157,7 +154,7 @@ class DisableMessagesSettingsForm extends ConfigFormBase {
       try {
         preg_match('/' . $pattern . '/', "This is a test string");
       }
-      catch (Exception $e) {
+      catch (\Exception $e) {
       }
       if ($_disable_messages_error) {
         $form_state->setErrorByName('disable_messages_ignore_patterns', t('"@pattern" is not a valid regular expression. Preg error (@error_no) - @error',