diff --git a/includes/media.filter.inc b/includes/media.filter.inc
index b102e24..388b29f 100644
--- a/includes/media.filter.inc
+++ b/includes/media.filter.inc
@@ -750,7 +750,7 @@ function media_filter_track_usage($fid) {
 }
 
 /**
- * Implements hook_entity_dependencies()
+ * Implements hook_entity_dependencies().
  */
 function media_entity_dependencies($entity, $entity_type) {
   // Go through all the entity's text fields and add a dependency on any files
@@ -804,14 +804,14 @@ function media_filter_replace_tokens_in_all_text_fields($entity_type, $entity, $
 }
 
 /**
- * preg_replace callback to replace file IDs with UUIDs in a media token.
+ * Callback to replace file IDs with UUIDs in a media token.
  */
 function media_token_fid_to_uuid($matches) {
   return _media_token_uuid_replace($matches, 'entity_get_uuid_by_id');
 }
 
 /**
- * preg_replace callback to replace UUIDs with file IDs in a media token.
+ * Callback to replace UUIDs with file IDs in a media token.
  */
 function media_token_uuid_to_fid($matches) {
   return _media_token_uuid_replace($matches, 'entity_get_id_by_uuid');
@@ -820,16 +820,15 @@ function media_token_uuid_to_fid($matches) {
 /**
  * Helper function to replace UUIDs with file IDs or vice versa.
  *
- * @param $matches
+ * @param array $matches
  *   An array of matches for media tokens, from a preg_replace_callback()
  *   callback function.
- * @param $entity_uuid_function
+ * @param string $entity_uuid_function
  *   Either 'entity_get_uuid_by_id' (to replace file IDs with UUIDs in the
  *   token) or 'entity_get_id_by_uuid' (to replace UUIDs with file IDs).
  *
- * @return
- *   A string representing the JSON-encoded token, with the appropriate
- *   replacement between file IDs and UUIDs.
+ * @return string
+ *   A string representing the JSON-encoded token, with the appropriate.
  */
 function _media_token_uuid_replace($matches, $entity_uuid_function) {
   $tag = $matches[0];