diff --git a/modules/commons/commons_wysiwyg/commons_wysiwyg.module b/modules/commons/commons_wysiwyg/commons_wysiwyg.module
index 98f2347..6cc147a 100644
--- a/modules/commons/commons_wysiwyg/commons_wysiwyg.module
+++ b/modules/commons/commons_wysiwyg/commons_wysiwyg.module
@@ -1,22 +1,54 @@
 <?php
+
+/**
+ * @file
+ * Provides the ability to edit content using a WYSIWYG editor.
+ */
+
 /**
  * Implements hook_element_info_alter().
- * Sets the default format if the user's default format is filtered_html.
+ *
+ * Simplify the content editing UI by removing filter format selection and tips.
  */
 function commons_wysiwyg_element_info_alter(&$type) {
   $type['text_format']['#pre_render'][] = 'commons_wysiwyg_process_filter_format';
 }
 
 /**
- * Callback function to process the filter format and remove the fieldset.
- * More info:  http://drupal.org/node/1949552
+ * Callback function to remove format selection and tips from text_formats.
+ *
+ * @see http://drupal.org/node/1949552
  */
 function commons_wysiwyg_process_filter_format($element) {
+  // Verify that the element has a filter format.
+  if (!isset($element['format'])) {
+    return $element;
+  }
+
+  $field = &$element['value'];
+
+  // Verify that the element can contain a value.
+  if (!isset($field['#value'])) {
+    return $element;
+  }
+
   global $user;
-  $formats = filter_formats($user);
-  if (count($formats) <= 2 && array_key_exists('filtered_html', $formats)) {
-    unset($element['format']);
+  $account = $user;
+
+  // Privileged users should be able to view and modify filter formats.
+  if (user_access('administer filters', $account)) {
+    return $element;
+  }
+
+  // Determine which filter formats a user has access to.
+  $formats = filter_formats($account);
+
+  // If the user is given a choice between formats, default to filtered_html if
+  // it is available.
+  if (count($formats) >= 2 && array_key_exists('filtered_html', $formats)) {
+    $element['format']['#access'] = FALSE;
     $element['#format'] = 'filtered_html';
   }
+
   return $element;
-}
\ No newline at end of file
+}