diff --git a/video_recorder.admin.inc b/video_recorder.admin.inc
index 39107e8..2926d1d 100644
--- a/video_recorder.admin.inc
+++ b/video_recorder.admin.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *  Video Recorder module admin functions.
+ * Video Recorder module admin functions.
  */
 
 /**
@@ -109,12 +109,11 @@ function video_recorder_admin() {
  * Validate user input for video recorder admin form.
  */
 function video_recorder_admin_validate($form, &$form_state) {
-  /*
-  TODO work out if this is really needed - skwashd 2011-03-19
-  Drupal's valid_url() doesn't support other schemes - http://api.drupal.org/api/drupal/includes--common.inc/function/valid_url/6
-  PHP's parse_url doesn't really validate URLs - http://php.net/parse_url
-  */
 
+  // @todo Work out if this is really needed - skwashd 2011-03-19.
+  // Drupal's valid_url() doesn't support other schemes -
+  // http://api.drupal.org/api/drupal/includes--common.inc/function/valid_url/6
+  // PHP's parse_url doesn't really validate URLs - http://php.net/parse_url.
   $rtmp_parts = @parse_url($form_state['values']['video_recorder_rtmp_url']);
   if (!isset($rtmp_parts['scheme']) || 'rtmp' !== $rtmp_parts['scheme']) {
     form_set_error('video_recorder_rtmp_url', t('The URL must use a RTMP scheme'));
@@ -131,6 +130,9 @@ function video_recorder_admin_validate($form, &$form_state) {
   }
 }
 
+/**
+ * Retrieves list of available ImageCache presets.
+ */
 function _video_recorder_admin_get_presets() {
   module_load_include('module', 'imagecache');
 
diff --git a/video_recorder.inc b/video_recorder.inc
index 5597abd..0f4d839 100644
--- a/video_recorder.inc
+++ b/video_recorder.inc
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file Video Recorder common functions.
+ * @file
+ * Video Recorder common functions.
  */
 
 /**
@@ -116,7 +117,7 @@ function video_recorder_playback_rtmp_url($video_id) {
 }
 
 /**
- * Fetches the file system path for the thumbnail image
+ * Fetches the file system path for the thumbnail image.
  */
 function video_recorder_thumbnail_path($video_id) {
   $path = VIDEO_RECORDER_THUMBNAIL_PATH . "/thumb-{$video_id}.png";
@@ -160,13 +161,18 @@ function video_recorder_thumbnail_url($video) {
  *
  * This function is better than simply calling mt_rand() or any other built-in
  * PHP function because it can return a long string of bytes (compared to < 4
- * bytes normally from mt_rand()) and uses the best available pseudo-random source.
+ * bytes normally from mt_rand()) and uses the best available pseudo-random
+ * source.
  *
- * Copied verbatim from drupal_random_bytes() from D7
- *  @link http://api.drupal.org/api/drupal/includes--bootstrap.inc/function/drupal_random_bytes/7
+ * Copied verbatim from
+ * @link http://api.drupal.org/api/drupal/includes--bootstrap.inc/function/drupal_random_bytes/7 drupal_random_bytes() @endlink
+ * from D7
  *
- * @param $count
+ * @param int $count
  *   The number of characters (bytes) to return in the string.
+ *
+ * @return string
+ *   String of highly randomized bytes.
  */
 function video_recorder_random_bytes($count) {
   // $random_state does not use drupal_static as it stores random bytes.
diff --git a/video_recorder.module b/video_recorder.module
index 44c6c37..506821e 100644
--- a/video_recorder.module
+++ b/video_recorder.module
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file Video Recorder module.
+ * @file
+ * Video Recorder module.
  */
 
 module_load_include('inc', 'video_recorder');
@@ -108,23 +109,25 @@ function video_recorder_theme($existing, $type, $theme, $path) {
 /**
  * Themes the video recorder widget.
  *
- * @param $video_id
+ * @param string $video_id
  *   The unique identifier for the video to be recorded.
  *
- * @param $options
+ * @param array $options
  *   An array of parameters that get sent to the Flash recorder.
- *    id           - The id for the HTML element for the recorder.
- *    rtmp_url     - The target URL for streaming the video recording to.
- *    bandwidth    - The maximum amount of bandwidth an uploaded video will consume.
- *    compression  - The minimum compression quality an uploaded video must maintain.
- *    fps          - The number of frames per second an uploaded video will have.
- *    kfs          - The number of seconds in between each keyframe.
- *    length       - The maximum length of an uploaded video, measured in seconds.
+ *   - id: The id for the HTML element for the recorder.
+ *   - rtmp_url: The target URL for streaming the video recording to.
+ *   - bandwidth: The maximum amount of bandwidth an uploaded video will
+ *     consume.
+ *   - compression: The minimum compression quality an uploaded video must
+ *     maintain.
+ *   - fps: The number of frames per second an uploaded video will have.
+ *   - kfs: The number of seconds in between each keyframe.
+ *   - length: The maximum length of an uploaded video, measured in seconds.
  *
- * @return
- *   HTML ready for the browser
+ * @return string
+ *   HTML ready for the browser.
  */
-function theme_video_recorder_recorder($video_id, $options=array()) {
+function theme_video_recorder_recorder($video_id, $options = array()) {
   global $base_path;
 
   $video_id     = check_plain($video_id);
@@ -140,7 +143,7 @@ function theme_video_recorder_recorder($video_id, $options=array()) {
     'fps' => $fps,
     'height' => (int) $options['height'],
     'id' => $id,
-    // calculate number of frames between each keyframe based on current FPS
+    // Calculate number of frames between each keyframe based on current FPS.
     'keyframe' => $fps * $kfs,
     'maxLength' => (int) $options['length'],
     'playText' => check_plain($options['play']),
@@ -171,9 +174,9 @@ function theme_video_recorder_recorder($video_id, $options=array()) {
         <param name="bgcolor" value="#ffffff" />
         <param name="allowScriptAccess" value="sameDomain" />
         <param name="FlashVars" value="{$flash_vars}" />
-        <embed src="{$recorder}" quality="high" bgcolor="#ffffff" width="640" height="480" name="recorder" align="middle" 
-          play="true" loop="false" quality="high" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" 
-          pluginspage="http://www.adobe.com/go/getflashplayer" 
+        <embed src="{$recorder}" quality="high" bgcolor="#ffffff" width="640" height="480" name="recorder" align="middle"
+          play="true" loop="false" quality="high" allowScriptAccess="sameDomain" type="application/x-shockwave-flash"
+          pluginspage="http://www.adobe.com/go/getflashplayer"
           FlashVars="{$flash_vars}">
         </embed>
       </object>
@@ -226,35 +229,34 @@ function video_recorder_thumbnail($video_id) {
   }
 
   switch ($_SERVER['REQUEST_METHOD']) {
-    default:
-      return drupal_goto(video_recorder_thumbnail_url($video_id));
-      break;
-
     case 'POST':
       $image = file_get_contents("php://input");
       $result = video_recorder_thumbnail_save($video_id, $image);
       drupal_json(array('result' => $result));
+
+    default:
+      return drupal_goto(video_recorder_thumbnail_url($video_id));
   }
 }
 
 /**
- * Implementation of hook_imagecache_default_presets().
+ * Implements of hook_imagecache_default_presets().
  */
 function video_recorder_imagecache_default_presets() {
   $presets = array();
-  $presets['video_recorder_thumbnail'] = array (
-      'presetname' => 'video_recorder_thumbnail',
-      'actions' => array (
-        0 => array (
-          'weight' => '0',
-          'module' => 'imagecache',
-          'action' => 'imagecache_scale_and_crop',
-          'data' => array (
-            'width' => '120',
-            'height' => '120',
-            ),
-          ),
+  $presets['video_recorder_thumbnail'] = array(
+    'presetname' => 'video_recorder_thumbnail',
+    'actions' => array(
+      0 => array(
+        'weight' => '0',
+        'module' => 'imagecache',
+        'action' => 'imagecache_scale_and_crop',
+        'data' => array(
+          'width' => '120',
+          'height' => '120',
         ),
-      );
+      ),
+    ),
+  );
   return $presets;
 }