diff --git a/README.txt b/README.txt
index 159afb5..9c3b101 100644
--- a/README.txt
+++ b/README.txt
@@ -8,8 +8,8 @@ current context will become active on.
 
 Requirements
 -----------------------------------------
-Domain Context is compatible with Context 6.x-3.0-beta4 and up as well as the 
-Domain Access module 6.x-2.4 and up.  
+Domain Context is compatible with Context 7.x-3.0-beta2 and up as well as the 
+Domain Access module 7.x-3.3 and up.  
 
 Hooks used
 -----------------------------------------
@@ -20,5 +20,5 @@ used in this module.
 Maintainer
 -----------------------------------------
 - rjstatic (R.J. Steinert) of raSANTIAGO.com
-
-
+- xjm (Jess) of University of Wisconsin-Madison
+- larowlan (Lee Rowlands) of RowlandsGroup.com
diff --git a/domaincontext.info b/domaincontext.info
index e85e9a9..7b19090 100644
--- a/domaincontext.info
+++ b/domaincontext.info
@@ -1,4 +1,3 @@
-; $Id: domaincontext.info,v 1.1 2010/08/27 17:38:54 xjm Exp $
 name = Domain Context
 description = "Provides a Domain condition plugin for the Context module."
 package = "Domain Access"
@@ -7,4 +6,3 @@ dependencies[] = domain
 dependencies[] = context
 
 files[] = plugins/domaincontext_context_condition_domain.inc
-
diff --git a/domaincontext.install b/domaincontext.install
index 9a2ec9a..3e635f4 100644
--- a/domaincontext.install
+++ b/domaincontext.install
@@ -11,4 +11,3 @@
 function domaincontext_enable() {
   context_invalidate_cache();
 }
-
diff --git a/domaincontext.module b/domaincontext.module
index 4e6a712..1564428 100644
--- a/domaincontext.module
+++ b/domaincontext.module
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Provides a Domain condition plugin for the Context module.
diff --git a/plugins/domaincontext_context_condition_domain.inc b/plugins/domaincontext_context_condition_domain.inc
index 4761ed1..2ed6d06 100644
--- a/plugins/domaincontext_context_condition_domain.inc
+++ b/plugins/domaincontext_context_condition_domain.inc
@@ -1,6 +1,4 @@
 <?php
-// $Id: domaincontext_context_condition_domain.inc,v 1.1.2.1 2010/08/28 19:29:38 xjm Exp $
-
 /**
  * @file
  * Context plugin to supply the domain as a context condition.
@@ -10,6 +8,9 @@
  * Expose domains as a context condition.
  */
 class domaincontext_context_condition_domain extends context_condition {
+  /**
+   * Fetch condition values.
+   */
   function condition_values() {
     $values = array();
     $format = domain_select_format();
@@ -22,6 +23,9 @@ class domaincontext_context_condition_domain extends context_condition {
     return $values;
   }
 
+  /**
+   * Execute condition callback.
+   */
   function execute() {
     $domain = domain_get_domain();
     $domain_id = $domain['domain_id'];