Enhance CAPTCHA comment form html

diff --git a/wp-content/plugins/captcha/captcha.php b/wp-content/plugins/captcha/captcha.php
index ad623ae..f43f6d1 100644
--- a/wp-content/plugins/captcha/captcha.php
+++ b/wp-content/plugins/captcha/captcha.php
@@ -675,9 +675,10 @@ if ( ! function_exists( 'cptch_comment_form' ) ) {

        /* captcha html - comment form */
        echo '<p class="cptch_block">';
-       if ( "" != $cptch_options['cptch_label_form'] )
+       if ( "" != $cptch_options['cptch_label_form'] ) {
            echo '<label>' . stripslashes( $cptch_options['cptch_label_form'] ) . '<span class="required"> ' . $cptch_options['cptch_required_symbol'] . '</span></label>';
-       echo '<br />';
+           echo '<br />';
+       }
        cptch_display_captcha();
        echo '</p>';

@@ -717,9 +718,10 @@ if ( ! function_exists( 'cptch_comment_form_wp3' ) ) {

        /* captcha html - comment form */
        echo '<p class="cptch_block">';
-       if ( "" != $cptch_options['cptch_label_form'] )
+       if ( "" != $cptch_options['cptch_label_form'] ) {
            echo '<label>' . stripslashes( $cptch_options['cptch_label_form'] ) . '<span class="required"> ' . $cptch_options['cptch_required_symbol'] . '</span></label>';
-       echo '<br />';
+           echo '<br />';
+       }
        cptch_display_captcha();
        echo '</p>';

@@ -1010,10 +1012,12 @@ if ( ! function_exists( 'cptch_display_captcha' ) ) {
        }
        /* Add hidden field with encoding result */
        ?>
-       <input type="hidden" name="cptch_result" value="<?php echo $str = cptch_encode( $array_math_expretion[ $rand_input ], $str_key, $cptch_time ); ?>" />
-       <input type="hidden" name="cptch_time" value="<?php echo $cptch_time; ?>" />
-       <input type="hidden" value="Version: 2.4" />
-       <?php echo $str_math_expretion; ?>
+       <span class="cptch_task">
+           <input type="hidden" name="cptch_result" value="<?php echo $str = cptch_encode( $array_math_expretion[ $rand_input ], $str_key, $cptch_time ); ?>" />
+           <input type="hidden" name="cptch_time" value="<?php echo $cptch_time; ?>" />
+           <input type="hidden" value="Version: 2.4" />
+           <?php echo $str_math_expretion; ?>
+       </span>
    <?php
    }
 }
@@ -1308,10 +1312,12 @@ if ( ! function_exists( 'cptch_display_captcha_custom' ) ) {
            $str_math_expretion .= $array_math_expretion[2];
        }
        /* Add hidden field with encoding result */
+       $content .= '<span class="cptch_task">';
        $content .= '<input type="hidden" name="cptch_result" value="' . $str = cptch_encode( $array_math_expretion[ $rand_input ], $str_key, $cptch_time ) . '" />
        <input type="hidden" name="cptch_time" value="' . $cptch_time . '" />
        <input type="hidden" value="Version: 2.4" />';
-       $content .= $str_math_expretion;
+       $content .= $str_math_expretion;
+       $content .= '</span>';
        return $content;
    }
 }