diff --git a/election.admin.inc b/election.admin.inc
index 4a7fdea48d8c4c4ca5a7f64cc36a737c285ea74a..de224254917741ddc79067aaf0c82ed0063b5a14 100644
--- a/election.admin.inc
+++ b/election.admin.inc
@@ -142,7 +142,7 @@ function election_list_form($form, $form_state) {
       'title' => array(
         'data' => array(
           '#type' => 'link',
-          '#title' => $election->title,
+          '#title' => check_plain($election->title),
           '#href' => election_uri_path($election),
         ),
       ),
@@ -400,8 +400,8 @@ function election_form($form, &$form_state, $election) {
     '#type' => 'select',
     '#default_value' => isset($election->anonymous)? $election->anonymous : 1,
     '#options' => array(
-       1 => 'Anonymous: voters can never be identified.',
-       0 => 'Tracked: voters can be identified if necessary.',
+      1 => 'Anonymous: voters can never be identified.',
+      0 => 'Tracked: voters can be identified if necessary.',
     ),
     '#required' => TRUE,
     '#description' => 'If this is set to Tracked, it is technically possible (although not easy) to link votes with voters. This may be useful for testing purposes. If this is set to Anonymous during voting, it is impossible to make this link. Tracking won\'t work retrospectively.',
diff --git a/election.controller.inc b/election.controller.inc
index 424623aff1395ba95a2e2d08059c2f49212216e1..a7376749fb9a024745abddc0a2b626dcbcc52028 100644
--- a/election.controller.inc
+++ b/election.controller.inc
@@ -109,9 +109,6 @@ class ElectionController extends DrupalDefaultEntityController {
         return FALSE;
       }
 
-// @todo this doesn't make sense
-//      module_invoke_all('entity_delete', $election, 'election');
-
       cache_clear_all();
       $this->resetCache();
 
diff --git a/election.module b/election.module
index 34a453a2b9812b4abaa19ce199b3d28f06a6bdf7..15e43ca9e3050e19f3c1e86957b8179aae2ec9d5 100644
--- a/election.module
+++ b/election.module
@@ -670,7 +670,7 @@ function election_delete_multiple(array $election_ids) {
 /**
  * Wrapper function to allow deleting an individual election.
  *
- * @see election_delete_multiple().
+ * @see election_delete_multiple()
  *
  * @param mixed $election_id
  *   Single election ID.
@@ -705,7 +705,7 @@ function election_post_delete_multiple(array $post_ids) {
 /**
  * Wrapper function to allow deleting an individual election post.
  *
- * @see election_post_delete_multiple().
+ * @see election_post_delete_multiple()
  *
  * @param mixed $post_id
  *   Single post ID.
@@ -924,7 +924,7 @@ function election_pathauto($op) {
 /**
  * Allow bulk updating of paths. See the Pathauto module.
  *
- * @see election_pathauto().
+ * @see election_pathauto()
  * @param array &$context
  * @return void
  */
diff --git a/election.pages.inc b/election.pages.inc
index 0a253ff252948f079677c61fd3560b5174246a73..e6a560db5dbe73ee810095db6530dc2d9532f417 100644
--- a/election.pages.inc
+++ b/election.pages.inc
@@ -1,9 +1,56 @@
 <?php
 /**
  * @file
- * Page callbacks for the Election module.
+ * Menu callbacks for pages in the Election module.
  */
 
+/**
+ * Menu callback for an election, path: election/%election.
+ *
+ * @param stdClass $election
+ * @param string $view_mode
+ *   Optional.
+ *
+ * @return array
+ *   Render array.
+ */
+function election_page_view($election, $view_mode = 'full') {
+
+  drupal_set_breadcrumb(
+    _election_build_breadcrumb($election)
+  );
+
+  // Remove previously built content, if it exists.
+  $election->content = array();
+
+  if ($view_mode == 'teaser') {
+    $election->content['title'] = array(
+      '#markup' => filter_xss($election->title),
+      '#weight' => -5,
+    );
+  }
+  else {
+    drupal_set_title($election->title);
+  }
+
+  field_attach_prepare_view('election', array($election->election_id => $election), $view_mode);
+  entity_prepare_view('election', array($election->election_id => $election));
+  $election->content += field_attach_view('election', $election, $view_mode);
+
+  return $election->content;
+}
+
+/**
+ * Menu callback for an election post, path: election/%election/posts/%election_post.
+ *
+ * @param stdClass $election
+ * @param stdClass $post
+ * @param string $view_mode
+ *   Optional.
+ *
+ * @return array
+ *   Render array.
+ */
 function election_post_page_view($election, $post, $view_mode = 'full') {
 
   drupal_set_breadcrumb(
@@ -23,6 +70,12 @@ function election_post_page_view($election, $post, $view_mode = 'full') {
       '#weight' => -5,
     );
   }
+  else {
+    $post->content['description'] = array(
+      '#markup' => filter_xss($post->description),
+      '#weight' => 0,
+    );
+  }
 
   field_attach_prepare_view('election_post', array($post->post_id => $post), $view_mode);
   entity_prepare_view('election_post', array($post->post_id => $post));
@@ -32,8 +85,14 @@ function election_post_page_view($election, $post, $view_mode = 'full') {
 }
 
 /**
- * Page callback for election/%election/posts.
+ * Menu callback for the list of election posts, path: election/%election/posts.
+ *
  * @todo use Views
+ *
+ * @param stdClass $election
+ *
+ * @return array
+ *   Render array.
  */
 function election_page_postlist($election) {
 
@@ -118,37 +177,4 @@ function election_page_postlist($election) {
 
   return $output;
 
-}
-
-function election_page_view($election, $view_mode = 'full') {
-
-  drupal_set_breadcrumb(
-    _election_build_breadcrumb($election)
-  );
-
-  // Remove previously built content, if it exists.
-  $election->content = array();
-
-  if ($view_mode == 'teaser') {
-    $election->content['title'] = array(
-      '#markup' => filter_xss($election->title),
-      '#weight' => -5,
-    );
-  }
-  else {
-    drupal_set_title($election->title);
-  }
-
-/*
-  $election->content['description'] = array(
-    '#markup' => filter_xss($election->description),
-    '#weight' => 0,
-  );
-*/
-
-  field_attach_prepare_view('election', array($election->election_id => $election), $view_mode);
-  entity_prepare_view('election', array($election->election_id => $election));
-  $election->content += field_attach_view('election', $election, $view_mode);
-
-  return $election->content;
-}
+}
\ No newline at end of file