diff --git a/README.txt b/README.txt
index 38496b6..668681d 100644
--- a/README.txt
+++ b/README.txt
@@ -34,11 +34,8 @@ $conf['locale_custom_strings_en'][''] = array(
 );
 
 
-
-
 BUGS, FEATURES, QUESTIONS
 =========================
 Post any bugs, features or questions to the issue queue:
 
 http://drupal.org/project/issues/email_registration
-
diff --git a/email_registration.module b/email_registration.module
index f4103a3..2f46b6a 100644
--- a/email_registration.module
+++ b/email_registration.module
@@ -47,23 +47,25 @@ function email_registration_user_insert(&$edit, &$account, $category = NULL) {
 }
 
 /**
- * Given a starting point for a Drupal username (e.g. the name portion of an
- * email address) return a legal, unique Drupal username. This function is
- * designed to work on the results of the /user/register or /admin/people/create
- * forms which have already called user_validate_name, valid_email_address
- * or a similar function. If your custom code is creating users, you should
- * ensure that the email/name is already validated using something like that.
+ * Given a starting point returns a legal, unique Drupal username.
+ *
+ * This function is designed to work on the results of the /user/register or
+ * /admin/people/create forms which have already called user_validate_name,
+ * valid_email_address or a similar function. If your custom code is creating
+ * users, you should ensure that the email/name is already validated using
+ * something like that.
  *
  * @param string $name
- *   A name from which to base the final user name.  May contain illegal characters; these will be stripped.
+ *   A name from which to base the final user name.  May contain illegal
+ *   characters; these will be stripped.
  * @param int $uid
- *   (optional) Uid to ignore when searching for unique user (e.g. if we update the username after the
- *   {users} row is inserted)
+ *   (optional) Uid to ignore when searching for unique user
+ *   (e.g. if we update the username after the {users} row is inserted)
  *
  * @return string
  *   A unique user name based on $name.
  *
- * @see user_validate_name().
+ * @see user_validate_name()
  */
 function email_registration_unique_username($name, $uid = 0) {
   // Iterate until we find a unique name.
@@ -144,6 +146,7 @@ function email_registration_form_user_login_block_alter(&$form, &$form_state) {
 
 /**
  * Form element validation handler for the user login form.
+ *
  * Allows users to authenticate by email, which is our preferred method.
  */
 function email_registration_user_login_validate($form, &$form_state) {
diff --git a/email_registration.test b/email_registration.test
index 59ac17d..1eef24e 100644
--- a/email_registration.test
+++ b/email_registration.test
@@ -20,7 +20,7 @@ class EmailRegistrationTestCase extends DrupalWebTestCase {
   /**
    * Implementation of setUp().
    */
-  function setUp() {
+  public function setUp() {
     parent::setUp('email_registration');
 
     // Configure to allow set password.
@@ -30,7 +30,7 @@ class EmailRegistrationTestCase extends DrupalWebTestCase {
   /**
    * Test various behaviors for anonymous users.
    */
-  function testRegistration() {
+  public function testRegistration() {
     variable_set('user_register', USER_REGISTER_VISITORS);
     // Try to register a user.
     $name = $this->randomName();