diff --git a/feedburner.admin.inc b/feedburner.admin.inc
index d02cf11..ab57565 100644
--- a/feedburner.admin.inc
+++ b/feedburner.admin.inc
@@ -7,8 +7,9 @@
 
 function feedburner_build_overview($category) {
   $keys = _feedburner_get_path_segment(5);
-  $output = drupal_get_form('feedburner_build_filter_form', $category, $keys);
-
+  $build_filter_form = drupal_get_form('feedburner_build_filter_form', $category, $keys);
+  
+  $output = render($build_filter_form);
   $header = array(
     array('data' => t('Local path')),
     array('data' => t('FeedBurner')),
@@ -25,13 +26,13 @@ function feedburner_build_overview($category) {
     $row[] = l($feed['alias'], $feed['alias'], array('alias' => TRUE, 'attributes' => array('alt' => $feed['description'], 'title' => $feed['description'])));
     if (isset($feed['feedburner'])) {
       $row[] = l($feed['feedburner'], _feedburner_construct_url($feed['feedburner']));
-      $row[] = l(t('Edit'), 'admin/build/feedburner/burn/'. $feed['path']);
-      $row[] = l(t('Unburn'), 'admin/build/feedburner/unburn/'. $feed['path']);
-      $row[] = l(t('Source'), $feed['path'], array('query' => 'redirect=no'));
+      $row[] = l(t('Edit'), 'admin/build/feedburner/burn/' . $feed['path']);
+      $row[] = l(t('Unburn'), 'admin/build/feedburner/unburn/' . $feed['path']);
+      $row[] = l(t('Source'), $feed['path'], array('query' => array('redirect' => 'no')));
     }
     else {
       $row[] = '';
-      $row[] = l(t('Burn'), 'admin/build/feedburner/burn/'. $feed['path']);
+      $row[] = l(t('Burn'), 'admin/build/feedburner/burn/' . $feed['path']);
       $row[] = '';
       $row[] = '';
     }
@@ -43,8 +44,8 @@ function feedburner_build_overview($category) {
     $rows[] = array(array('data' => $empty_message, 'colspan' => 5));
   }
 
-  $output .= theme('table', $header, $rows);
-  $output .= theme('pager', NULL, $row_limit);
+  $output .= theme('table', array('header' => $header, 'rows' => $rows));
+  $output .= theme('pager', array('limit' => $row_limit));
   return $output;
 }
 
@@ -64,7 +65,7 @@ function _feedburner_build_pager($array, $limit = 10) {
 /**
  * Return a form to filter URL aliases.
  */
-function feedburner_build_filter_form(&$form_state, $category, $keys = '') {
+function feedburner_build_filter_form($form, &$form_state, $category, $keys = '') {
   $form['#attributes'] = array('class' => 'search-form');
   $form['basic'] = array(
     '#type' => 'fieldset',
@@ -84,7 +85,7 @@ function feedburner_build_filter_form(&$form_state, $category, $keys = '') {
   $form['basic']['inline']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Filter'),
-    '#submit' => array('feedburner_build_filter_form_submit_filter'),
+    '#submit' => array('_feedburner_build_filter_form_submit_filter'),
   );
   $form['category'] = array(
     '#type' => 'value',
@@ -103,21 +104,28 @@ function feedburner_build_filter_form(&$form_state, $category, $keys = '') {
 /**
  * Process filter form submission when the Filter button is pressed.
  */
-function feedburner_build_filter_form_submit_filter($form, &$form_state) {
-  $form_state['redirect'] = 'admin/build/feedburner/list/'. $form_state['values']['category'] .'/'. trim($form_state['values']['filter']);
+function _feedburner_build_filter_form_submit_filter($form, &$form_state) {
+  $form_state['redirect'] = 'admin/build/feedburner/list/' . $form_state['values']['category'] . '/' . trim($form_state['values']['filter']);
 }
 
 /**
  * Process filter form submission when the Reset button is pressed.
  */
 function feedburner_build_filter_form_submit_reset($form, &$form_state) {
-  $form_state['redirect'] = 'admin/build/feedburner/list/'. $form_state['values']['category'];
+  $form_state['redirect'] = 'admin/build/feedburner/list/' . $form_state['values']['category'];
 }
 
 
 function feedburner_burn_form() {
   $path = _feedburner_get_path_segment(4);
-  $feedburner = db_result(db_query("SELECT feedburner FROM {feedburner} WHERE path = '%s'", $path));
+  $result = db_select('feedburner', 'f')
+    ->fields('f', array('feedburner'))
+    ->condition('path', $path)
+    ->execute();
+  foreach ($result as $feed) {
+    
+  }
+  
 
   $form['path'] = array(
     '#type' => 'textfield',
@@ -230,11 +238,11 @@ function feedburner_settings_form() {
     '#type' => 'checkbox',
     '#title' => t('Replace all links to burned FeedBurner feeds in the source HTML.'),
     '#default_value' => feedburner_var('replace_html'),
-    '#description' => t('This option is currently experimental.') .' '. t('This option requires that <a href="@clean-url">Clean URLs</a> are enabled along with the <a href="@url-alter">Url alter module</a>.', array('@clean-url' => url('admin/settings/clean-urls'), '@url-alter' => 'http://drupal.org/project/url_alter')),
+    '#description' => t('This option is currently experimental.') . ' ' . t('This option requires that <a href="@clean-url">Clean URLs</a> are enabled along with the <a href="@url-alter">Url alter module</a>.', array('@clean-url' => url('admin/settings/clean-urls'), '@url-alter' => 'http://drupal.org/project/url_alter'), array('locale' => 'en')),
     '#disabled' => !variable_get('clean_url', 0) || (url('feedburner/url-rewrite-test') && !defined('FEEDBURNER_CUSTOM_URL_REWRITE_OUTBOUND')),
   );
   //if (module_exists('advanced_help') && FALSE) {
-  //  $form['general']['feedburner_replace_html']['#description'] .= ' '. theme('advanced_help_topic', 'feedburner', 'settings-replace-links', t('[more help]'));
+  //  $form['general']['feedburner_replace_html']['#description'] .= ' ' . theme('advanced_help_topic', 'feedburner', 'settings-replace-links', t('[more help]'));
   //}
 
   $feeds = array(0 => 'None (disabled)') + _feedburner_get_feed_list('feedburner', array('key' => 'feedburner', 'fields' => 'feedburner'));
@@ -254,7 +262,7 @@ function feedburner_settings_form() {
     '#type' => 'checkboxes',
     '#title' => t('Display in node types'),
     '#default_value' => feedburner_var('feedflare_node_types'),
-    '#options' => node_get_types('names'),
+    '#options' => node_type_get_name(),
   );
   // @todo Find a better way to list node display types?
   $form['feedflare']['feedburner_feedflare_display'] = array(
@@ -297,7 +305,7 @@ function feedburner_settings_form() {
   //);
   //$form['account']['verified'] = array(
   //  '#type' => 'markup',
-  //  '#value' => '<p><strong>'. t('Account status:') .'</strong><br /><span style="color: '. ($auth ? 'green">'. t('Verified') : 'red">'. t('NOT VERIFIED')) .'</span></p>',
+  //  '#value' => filter_xss('<p><strong>' . t('Account status:') . '</strong><br /><span style="color: ' . ($auth ? 'green">' . t('Verified') : 'red">' . t('NOT VERIFIED')) . '</span></p>'),
   //);
   //
   //if (!_feedburner_can_api()) {
@@ -324,7 +332,7 @@ function feedburner_settings_form() {
   $form['advanced']['feedburner_domain'] = array(
     '#type' => 'textfield',
     '#title' => t('MyBrand custom domain'),
-    '#description' => t('MyBrand is a premium FeedBurner service that allows you to showcase your feeds by serving them from your own domain (for example, @domain). You must have access to change your CNAME entry in the DNS records for the domain you wish to change. For more information, see <a href="@link">@link</a>.', array('@link' => 'http://feedburner.google.com/fb/a/mybrand', '@domain' => 'feeds.'. $_SERVER['SERVER_NAME'])),
+    '#description' => t('MyBrand is a premium FeedBurner service that allows you to showcase your feeds by serving them from your own domain (for example, @domain). You must have access to change your CNAME entry in the DNS records for the domain you wish to change. For more information, see <a href="@link">@link</a>.', array('@link' => 'http://feedburner.google.com/fb/a/mybrand', '@domain' => 'feeds.' . $_SERVER['SERVER_NAME'])),
     '#default_value' => feedburner_var('domain'),
     '#field_prefix' => 'http://',
     '#field_suffix' => '/feedname',
@@ -357,13 +365,13 @@ function feedburner_settings_form_validate($form, &$form_state) {
   if (empty($useragents) || !preg_match('/\w+/', $useragents)) {
     drupal_set_message(t('Please enter at least one user agent that will have access to your site\'s feeds. It is strongly recommended to allow both the "feedburner" and "feedvalidator" user agents.'), 'error');
   }
-  $useragents = '/'. preg_replace(array('/[\r\n]+/', '/\\\\\*/'), array('|', '.*'), $useragents) .'/i';
+  $useragents = '/' . preg_replace(array('/[\r\n]+/', '/\\\\\*/'), array('|', '.*'), $useragents) . '/i';
   $values['feedburner_useragents'] = $useragents;
 
   // feedburner_domain
   $feedburner_domain = $values['feedburner_domain'];
   if ($feedburner_domain != feedburner_var('domain')) {
-    $request = drupal_http_request('http://'. $feedburner_domain .'/');
+    $request = drupal_http_request('http://' . $feedburner_domain . '/');
     if (!isset($request->headers['X-FB-Host']) || !isset($request->code) || $request->code != 400 || !isset($request->error) || $request->error != 'You must provide a feed uri') {
       // TODO: Insert help link for CNAME MyBrand editing (http://feedburner.google.com/fb/a/publishers/mybrand)
       drupal_set_message(t('The MyBrand domain <a href="http://@domain/">@domain</a> failed verification. Make sure you have edited the domain\'s CNAME settings before enabling this option.', array('@domain' => $feedburner_domain)), 'error');
@@ -375,11 +383,11 @@ function feedburner_settings_form_validate($form, &$form_state) {
  * Get a list of site feeds.
  */
 function _feedburner_get_site_feeds(&$feeds) {
-  $feeds[] = array('path' => 'rss.xml', 'description' => variable_get('site_name', 'Drupal') .' frontpage feed');
+  $feeds[] = array('path' => 'rss.xml', 'description' => variable_get('site_name', 'Drupal') . ' frontpage feed');
   $feeds[] = array('path' => 'aggregator/feed', 'description' => 'Aggregator feed', 'module' => 'aggregator');
-  $feeds[] = array('path' => 'blog/feed', 'description' => variable_get('site_name', 'Drupal') .' blogs', 'module' => 'blog');
-  $feeds[] = array('path' => 'crss', 'description' => variable_get('site_name', 'Drupal') .' comments', 'module' => 'commentrss');
-  $feeds[] = array('path' => 'atom/feed', 'description' => variable_get('site_name', 'Drupal') .' ATOM', 'module' => 'atom');
+  $feeds[] = array('path' => 'blog/feed', 'description' => variable_get('site_name', 'Drupal') . ' blogs', 'module' => 'blog');
+  $feeds[] = array('path' => 'crss', 'description' => variable_get('site_name', 'Drupal') . ' comments', 'module' => 'commentrss');
+  $feeds[] = array('path' => 'atom/feed', 'description' => variable_get('site_name', 'Drupal') . ' ATOM', 'module' => 'atom');
 }
 
 /**
@@ -412,7 +420,7 @@ function _feedburner_get_views_feeds(&$feeds, $key = NULL) {
 function _feedburner_get_blog_feeds(&$feeds) {
   $feeds[] = array(
     'path' => 'blog/feed',
-    'description' => variable_get('site_name', 'Drupal') .' blogs',
+    'description' => variable_get('site_name', 'Drupal') . ' blogs',
   );
 
   // Get all user blog feeds for users with the blogging permission granted
@@ -425,14 +433,14 @@ function _feedburner_get_blog_feeds(&$feeds) {
     $sql .= ' OR u.uid > 1';
   }
   elseif (count($blog_roles)) {
-    $sql .= ' OR ur.rid IN ('. db_placeholders($blog_roles) .')';
+    $sql .= ' OR ur.rid IN (' . db_placeholders($blog_roles) . ')';
     $args = array_keys($blog_roles);
   }
 
   $query = db_query($sql, $args);
   while ($account = db_fetch_object($query)) {
     $feeds[] = array(
-      'path' => 'blog/'. $account->uid .'/feed',
+      'path' => 'blog/' . $account->uid . '/feed',
       'description' => t("@username's blog", array('@username' => $account->name)),
     );
   }
@@ -442,10 +450,13 @@ function _feedburner_get_blog_feeds(&$feeds) {
  * Get a list of taxonomy feeds.
  */
 function _feedburner_get_taxonomy_feeds(&$feed) {
-  $query = db_query('SELECT tid, name FROM {term_data}');
-  while ($term = db_fetch_object($query)) {
+  //$query = db_query('SELECT tid, name FROM {taxonomy_term_data}');
+  $result = db_select('taxonomy_term_data', 'ttd')
+    ->fields('ttd')
+    ->execute();
+  foreach ($result as $term) {
     $feeds[] = array(
-      'path' => 'taxonomy/term/'. $term->tid .'/0/feed',
+      'path' => 'taxonomy/term/' . $term->tid . '/0/feed',
       'description' => $term->name,
     );
   }
@@ -455,7 +466,7 @@ function _feedburner_get_taxonomy_feeds(&$feed) {
  * Get a list of organic gropus feeds.
  */
 function _feedburner_get_og_feeds(&$feeds) {
-  /*$feeds[] = array(
+  /* $feeds[] = array(
     'path' => 'og/all/feed',
     'description' => t('Groups'),
   );
@@ -472,10 +483,16 @@ function _feedburner_get_og_feeds(&$feeds) {
   //  'description' => t('Recent posts in my groups'),
   //);
   _feedburner_get_views_feeds($feeds, 'og_');
-  $query = db_query("SELECT n.nid, n.title FROM {og} og LEFT JOIN {node} n USING (nid)");
-  while ($group = db_fetch_object($query)) {
+
+  // D6
+  // $query = db_query("SELECT n.nid, n.title FROM {og} og LEFT JOIN {node} n USING (nid)");
+  $result = db_select('og', 'og')
+    ->leftJoin('n', 'node', 'og.nid = n.nid')
+    ->fields('n', array('nid', 'title'))
+    ->execute();
+  foreach ($result as $group) {
     $feeds[] = array(
-      'path' => 'node/'. $group->nid .'/feed',
+      'path' => 'node/' . $group->nid . '/feed',
       'description' => $group->title,
     );
   }
@@ -495,7 +512,7 @@ function _feedburner_get_feed_list($category = 'site', $options = array()) {
 
   $categories = _feedburner_get_feed_categories();
   foreach ($categories as $category_key => $category_options) {
-    $function = '_feedburner_get_'. $category_key .'_feeds';
+    $function = '_feedburner_get_' . $category_key . '_feeds';
     if (($category == $category_key || $category == 'all') && $category_options['access'] && function_exists($function)) {
       $function($feeds);
     }
@@ -505,7 +522,11 @@ function _feedburner_get_feed_list($category = 'site', $options = array()) {
   // TODO: Fetch FeedBurner feeds from FeedManagement API
   if ($category == 'feedburner' || $options['feedburner']) {
     $query = db_query("SELECT path, feedburner FROM {feedburner}");
-    while ($feedburner_feed = db_fetch_array($query)) {
+    $result = db_select('feedburner', 'f')
+      ->fields('f', array('path', 'feedburner'))
+      ->execute();
+    foreach ($result as $feedburner_feed) {
+      $feedburner_feed = (array)$feedburner_feed;
       if ($category == 'all' || $category == 'feedburner' || $category == 'site') {
         $feeds[] = $feedburner_feed;
       }
@@ -575,7 +596,7 @@ function _feedburner_process_feed_list($feeds, $options = array()) {
 
     // Match regular expressions
     if (!empty($options['match']) && is_string($options['match'])) {
-      $regex = '/'. preg_quote($options['match'], '/') .'/i';
+      $regex = '/' . preg_quote($options['match'], '/') . '/i';
       $fields = array_keys($feed);
       $feed['value'] = FALSE;
       foreach ($fields as $field) {
@@ -707,21 +728,21 @@ function _feedburner_request_api($function, $args = array()) {
   }
 
   $request->function = $functions[$function];
-  $request->url = 'http://api.feedburner.com/'. $request->function['api'] .'/1.0/'. $function;
+  $request->url = 'http://api.feedburner.com/' . $request->function['api'] . '/1.0/' . $function;
   $request->method = isset($request->function['method']) ? $request->function['method'] : 'GET';
   $request->headers = array();
   $request->data = NULL;
 
   if ($request->function['api'] == 'management') {
     if (!isset($args['user']) && $auth = feedburner_var('auth')) {
-      $request->headers['Authorization'] = 'Basic '. $auth;
+      $request->headers['Authorization'] = 'Basic ' . $auth;
       unset($args['user']);
       unset($args['password']);
     }
-    //$request->url = 'http://api.feedburner.com/management/1.0/'. $function;
+    //$request->url = 'http://api.feedburner.com/management/1.0/' . $function;
   }
   elseif ($request->function['api'] == 'awareness') {
-    //$request->url = 'http://api.feedburner.com/awareness/1.0/'. $function;
+    //$request->url = 'http://api.feedburner.com/awareness/1.0/' . $function;
   }
 
   // Use secure request if PHP OpenSSL is available on any request
@@ -734,7 +755,7 @@ function _feedburner_request_api($function, $args = array()) {
     $request->data = drupal_query_string_encode($args);
   }
   elseif ($request->method == 'GET') {
-    $request->url .= '?'. drupal_query_string_encode($args);
+    $request->url .= '?' . drupal_query_string_encode($args);
   }
 
   $response = drupal_http_request($request->url, $request->headers, $request->method, $request->data);
@@ -786,7 +807,7 @@ function _feedburner_get_feed_features($uri, $cache = FALSE) {
   $feed->verified = FALSE;
 
   // Scrape details from the actual feed
-  $request = drupal_http_request(_feedburner_construct_url($uri) .'?format=xml');
+  $request = drupal_http_request(_feedburner_construct_url($uri) . '?format=xml');
 
   if (isset($request->error)) {
     $feed->error = $request->error;
@@ -855,19 +876,19 @@ function feedburner_autocomplete($category) {
     foreach ($feeds as $key => $feed) {
       $description = '';
       if ($feed['alias'] != $feed['path']) {
-        $description .= $feed['alias'] .' ('. $feed['path'] .')';
+        $description .= $feed['alias'] . ' (' . $feed['path'] . ')';
       }
       else {
         $description .= $feed['path'];
       }
       if (isset($feed['description'])) {
-        $description .= ' - '. $feed['description'];
+        $description .= ' - ' . $feed['description'];
       }
       $feeds[$key] = $description;
     }
   }
 
-  drupal_json($feeds);
+  drupal_json_output($feeds);
 
   /* $feeds = _feedburner_get_feed_list($cat, array('match' => $key, 'feedburner' => FALSE));
   $feeds = array_slice($feeds, 0, 10);
@@ -877,7 +898,7 @@ function feedburner_autocomplete($category) {
       $keepers[$feed['feedburner']] = $feed['feedburner'];
     }
     else {
-      $keepers[$feed['path']] = ($feed['alias'] != $feed['path'] ? $feed['alias'] .' ('. $feed['path'] .')' : $feed['path']) . ($feed['description'] ? ' - '. $feed['description'] : '');
+      $keepers[$feed['path']] = ($feed['alias'] != $feed['path'] ? $feed['alias'] . ' (' . $feed['path'] . ')' : $feed['path']) . ($feed['description'] ? ' - ' . $feed['description'] : '');
     }
   }
 
diff --git a/feedburner.info b/feedburner.info
index 43e7c02..6d0e37f 100644
--- a/feedburner.info
+++ b/feedburner.info
@@ -1,6 +1,11 @@
 name = Feedburner
 description = "Integrates with FeedBurner services, primarily feed redirection."
-core = 6.x
-suggests[] = commentrss
-suggests[] = advanced_help
-recommends[] = pathologic
+core = 7.x
+
+dependencies[] = redirect
+
+files[] = feedburner.admin.inc
+files[] = feedburner.install
+files[] = feedburner.module
+files[] = feedburner.pages.inc
+files[] = feedburner.test
\ No newline at end of file
diff --git a/feedburner.install b/feedburner.install
index 1963daf..456f020 100644
--- a/feedburner.install
+++ b/feedburner.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
 function feedburner_install() {
   drupal_install_schema('feedburner');
@@ -16,7 +16,7 @@ function feedburner_install() {
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function feedburner_uninstall() {
   drupal_uninstall_schema('feedburner');
@@ -30,7 +30,7 @@ function feedburner_uninstall() {
 }
 
 /**
- * Implementation of hook_requirements().
+ * Implements hook_requirements().
  */
 function feedburner_requirements($phase) {
   $requirements = array();
@@ -49,23 +49,23 @@ function feedburner_requirements($phase) {
 }
 
 /**
- * Implementation of hook_schema().
+ * Implementshook_schema().
  */
 function feedburner_schema() {
   $schema['feedburner'] = array(
-    'description' => t('Stores information on FeedBurner feed redirections.'),
+    'description' => 'Stores information on FeedBurner feed redirections.',
     'fields' => array(
       'path' => array(
         'type' => 'varchar',
         'length' => 128,
         'not null' => TRUE,
-        'description' => t('The source feed.'),
+        'description' => 'The source feed.',
       ),
       'feedburner' => array(
         'type' => 'varchar',
         'length' => 100,
         'not null' => TRUE,
-        'description' => t('FeedBurner feed.'),
+        'description' => 'FeedBurner feed.',
       ),
     ),
     'primary key' => array('path'),
@@ -97,7 +97,7 @@ function feedburner_update_6000() {
   if (count($old_feeds)) {
     variable_del('feedburner_feeds');
     foreach ($old_feeds as $path => $feedburner) {
-      $ret[] = update_sql("INSERT INTO {feedburner} (path, feedburner) VALUES ('". $path ."', '". $feedburner ."')");
+      $ret[] = update_sql("INSERT INTO {feedburner} (path, feedburner) VALUES ('" . $path . "', '" . $feedburner . "')");
     }
   }
 
@@ -105,7 +105,7 @@ function feedburner_update_6000() {
   if (db_table_exists('feedburner_feeds')) {
     $old_feeds = db_query("SELECT local_uri, fb_uri FROM {feedburner_feeds}");
     while ($old_feed = db_fetch_object($old_feeds)) {
-      $ret[] = update_sql("INSERT INTO {feedburner} (path, feedburner) VALUES ('". $old_feed->local_uri ."', '". $old_feed->fb_uri ."')");
+      $ret[] = update_sql("INSERT INTO {feedburner} (path, feedburner) VALUES ('" . $old_feed->local_uri . "', '" . $old_feed->fb_uri . "')");
     }
     db_drop_table($ret, 'feedburner_feeds');
   }
@@ -113,7 +113,7 @@ function feedburner_update_6000() {
   // Convert old useragent variable to full regex expression
   $useragents = variable_get('feedburner_useragents', '/feedburner|feedvalidator/i');
   if (!preg_match('%^/.*/i$%', $useragents)) {
-    variable_set('feedburner_useragents', '/'. $useragents .'/i');
+    variable_set('feedburner_useragents', '/' . $useragents . '/i');
   }
 
   $ret[] = update_sql("UPDATE {system} SET weight = -1 WHERE type = 'module' AND name = 'feedburner'");
diff --git a/feedburner.module b/feedburner.module
index 2dd4616..d73cb0d 100644
--- a/feedburner.module
+++ b/feedburner.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implementation of hook_help().
+ * Implements hook_help().
  */
 function feedburner_help($path, $arg) {
   switch ($path) {
@@ -22,29 +22,38 @@ function feedburner_help($path, $arg) {
 }
 
 /**
- * Implementation of hook_perm().
+ * Implements hook_permission().
  */
-function feedburner_perm() {
+function feedburner_permission() {
   return array(
-    'administer FeedBurner',
-    'view FeedFlare',
-    'add FeedBurner feed to own blog',
+    'administer feedburner' => array(
+      'title' => t('Administer Feedburner'),
+      'description' => t('Perform administraiton tasks for Feedburner.')
+    ),
+    'view feedflare' => array(
+      'title' => t('View Feedflare'),
+      'description' => t('View Feedflare.')
+    ),
+    'add feedburner feed to own blog' => array(
+      'title' => t('Add Feedburner to own blog'),
+      'description' => t('Add Feedburner feed to own blog.')
+    ),
   );
 }
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function feedburner_menu() {
-  $items['admin/build/feedburner'] = array(
+  $items['admin/structure/feedburner'] = array(
     'title' => 'FeedBurner',
     'description' => 'Change site feed redirections to FeedBurner.',
     'page callback' => 'feedburner_build_overview',
     'page arguments' => array('site'),
-    'access arguments' => array('administer FeedBurner'),
+    'access arguments' => array('administer feedburner'),
     'file' => 'feedburner.admin.inc',
   );
-  $items['admin/build/feedburner/list'] = array(
+  $items['admin/structure/feedburner/list'] = array(
     'title' => 'Feeds',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
@@ -57,46 +66,46 @@ function feedburner_menu() {
       'title' => drupal_ucfirst($category_key),
     );
     if ($category_options['access']) {
-      $items['admin/build/feedburner/list/'. $category_key] = array(
+      $items['admin/structure/feedburner/list/' . $category_key] = array(
         'title' => $category_options['title'],
         'type' => $category_options['default'] ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
         'weight' => $category_options['default'] ? -10 : 0,
         'page callback' => 'feedburner_build_overview',
         'page arguments' => array($category_key),
-        'access arguments' => array('administer FeedBurner'),
+        'access arguments' => array('administer feedburner'),
         'file' => 'feedburner.admin.inc',
       );
     }
   }
-  $items['admin/build/feedburner/burn'] = array(
+  $items['admin/structure/feedburner/burn'] = array(
     'title' => 'Burn feed',
     'type' => MENU_LOCAL_TASK,
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedburner_burn_form'),
-    'access arguments' => array('administer FeedBurner'),
+    'access arguments' => array('administer feedburner'),
     'file' => 'feedburner.admin.inc',
   );
-  $items['admin/build/feedburner/unburn'] = array(
+  $items['admin/structure/feedburner/unburn'] = array(
     'title' => 'Unburn feed',
     'type' => MENU_CALLBACK,
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedburner_unburn_form'),
-    'access arguments' => array('administer FeedBurner'),
+    'access arguments' => array('administer feedburner'),
     'file' => 'feedburner.admin.inc',
   );
-  $items['admin/build/feedburner/settings'] = array(
+  $items['admin/structure/feedburner/settings'] = array(
     'title' => 'Settings',
     'type' => MENU_LOCAL_TASK,
     'description' => 'Change settings for FeedBurner.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedburner_settings_form'),
-    'access arguments' => array('administer FeedBurner'),
+    'access arguments' => array('administer feedburner'),
     'file' => 'feedburner.admin.inc',
   );
   $items['js/feedburner/autocomplete'] = array(
     'page callback' => 'feedburner_autocomplete',
     'type' => MENU_CALLBACK,
-    'access arguments' => array('administer FeedBurner'),
+    'access arguments' => array('administer feedburner'),
     'file' => 'feedburner.admin.inc',
   );
   $items['feedburner/feedflare'] = array(
@@ -109,20 +118,20 @@ function feedburner_menu() {
 }
 
 /**
- * Implementation of hook_boot().
+ * Implements hook_boot().
  */
 function feedburner_boot() {
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_PAGE_HEADER, FALSE);
   $path = _feedburner_get_path_segment();
   feedburner_check_redirect($path);
 }
 
 /**
- * Implementation of hook_url_alter_outbound() from the url_alter module.
+ * Implements hook_url_alter_outbound() from the url_alter module.
  */
 function feedburner_url_outbound_alter(&$path, &$options, $original_path) {
   static $feeds;
-  
+
   if ($original_path == 'feedburner/url-rewrite-test') {
     // Create a define that can be checked in admin/build/feedburner/settings.
     define('FEEDBURNER_CUSTOM_URL_REWRITE_OUTBOUND', TRUE);
@@ -148,7 +157,7 @@ function feedburner_url_outbound_alter(&$path, &$options, $original_path) {
     if (!empty($feeds[$original_path])) {
       $path = $feeds[$original_path];
       $options['absolute'] = TRUE;
-      $options['base_url'] = 'http://'. feedburner_var('domain');
+      $options['base_url'] = 'http://' . feedburner_var('domain');
       //$path = _feedburner_construct_url($feeds[$original_path]);
       //$options['external'] = TRUE;
     }
@@ -156,7 +165,7 @@ function feedburner_url_outbound_alter(&$path, &$options, $original_path) {
 }
 
 /**
- * Implementation of custom_url_rewrite_outbound().
+ * Implements custom_url_rewrite_outbound().
  *
  * This function will only work if custom_url_rewrite_outbound is not already
  * defined, or the url_alter module is not enabled (might work for a majority
@@ -169,30 +178,20 @@ if (!function_exists('custom_url_rewrite_outbound')) {
 }
 
 /**
- * Implementation of hook_nodeapi().
- * @todo Remove in Drupal 7.
- */
-function feedburner_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  switch ($op) {
-    case 'view':
-      return feedburner_node_view($node, $a3, $a4);
-    case 'insert':
-      return feedburner_node_insert($node);
-    case 'update':
-      return feedburner_node_update($node);
-    case 'delete':
-      return feedburner_node_delete($node);
-  }
-}
-
-/**
- * Implementation of hook_node_view().
+ * Implements hook_node_view().
  *
  * Inserts FeedFlare into nodes.
  */
-function feedburner_node_view(&$node, $teaser = NULL, $page = NULL) {
-  if ($node->build_mode != NODE_BUILD_PREVIEW && user_access('view FeedFlare')) {
-    $display = $teaser ? 'teaser' : ($page ? 'page' : NULL);
+function feedburner_node_view(&$node, $view_mode = 'full', $langcode = NULL) {
+  if ($view_mode == 'teaser') {
+    $teaser = TRUE;
+  }
+  else {
+    $teaser = FALSE;
+  }
+
+  if ($node->in_preview && user_access('view feedflare')) {
+    $display = $teaser ? 'teaser' : NULL;
     //$display = array('teaser' => $teaser, 'page' => $page);
     $feedflare_display = feedburner_var('feedflare_display');
     if (in_array($display, $feedflare_display) && $feedflare = _feedburner_get_feedflare_script($node)) {
@@ -205,7 +204,7 @@ function feedburner_node_view(&$node, $teaser = NULL, $page = NULL) {
 }
 
 /**
- * Implementation of hook_node_insert().
+ * Implements hook_node_insert().
  *
  * Pings the FeedBurner service when nodes as inserted.
  */
@@ -216,7 +215,7 @@ function feedburner_node_insert($node) {
 }
 
 /**
- * Implementation of hook_node_update().
+ * Implements hook_node_update().
  */
 function feedburner_node_update($node) {
   if (!module_exists('ping')) {
@@ -225,7 +224,7 @@ function feedburner_node_update($node) {
 }
 
 /**
- * Implementation of hook_node_delete().
+ * Implements hook_node_delete().
  */
 function feedburner_node_delete($node) {
   if ($node->status && !module_exists('ping')) {
@@ -234,7 +233,7 @@ function feedburner_node_delete($node) {
 }
 
 /**
- * Implementation of hook_ping().
+ * Implements hook_ping().
  */
 function feedburner_ping($name = '', $url = '') {
   if (empty($name)) {
@@ -254,21 +253,7 @@ function feedburner_ping($name = '', $url = '') {
 }
 
 /**
- * Implementation of hook_user().
- *
- * Displays, validates and saves an option to redirect a user's blog feed.
- */
-function feedburner_user($type, &$edit, &$account, $category = NULL) {
-  switch ($type) {
-    case 'update':
-      return feedburner_user_update($edit, $account, $category);
-    case 'delete':
-      return feedburner_user_delete($edit, $account, $category);
-  }
-}
-
-/**
- * Implementation of hook_user_update().
+ * Implements hook_user_update().
  */
 function feedburner_user_update(&$edit, &$account, $category = NULL) {
   if (isset($edit['feedburner_feedburner'])) {
@@ -279,19 +264,19 @@ function feedburner_user_update(&$edit, &$account, $category = NULL) {
 }
 
 /**
- * Implementation of hook_user_delete().
+ * Implements hook_user_delete().
  */
 function feedburner_user_delete(&$edit, &$account, $category = NULL) {
-  feedburner_delete(array('path' => 'blog/'. $account->uid .'/feed'));
+  feedburner_delete(array('path' => 'blog/' . $account->uid . '/feed'));
 }
 
 /**
- * Implementation of hook_form_FORM_ID_alter().
+ * Implements hook_form_FORM_ID_alter().
  */
 function feedburner_form_user_profile_form_alter(&$form, $form_state) {
   if ($form['_category']['#value'] == 'account') {
     $account = $form['_account']['#value'];
-    if (user_access('create blog entries', $account) && user_access('add FeedBurner feed to own blog', $account)) {
+    if (user_access('create blog entries', $account) && user_access('add feedburner feed to own blog', $account)) {
       $user_blog_feed = "blog/{$account->uid}/feed";
       if (!isset($form['blog'])) {
         $form['blog'] = array(
@@ -320,58 +305,53 @@ function feedburner_form_user_profile_form_alter(&$form, $form_state) {
 }
 
 /**
- * Implementation of hook_theme().
+ * Implements hook_theme().
  */
 function feedburner_theme() {
   return array(
     'feedburner_block_email' => array(
-      'arguments' => array('feed' => NULL),
+      'variables' => array('feed' => NULL),
       'file' => 'feedburner.pages.inc',
     ),
     'feedburner_block_feedcount' => array(
-      'arguments' => array('feed' => NULL),
+      'variables' => array('feed' => NULL),
       'file' => 'feedburner.pages.inc',
     ),
     'feedburner_block_feeds' => array(
-      'arguments' => array(),
+      'variables' => array(),
       'file' => 'feedburner.pages.inc',
     ),
   );
 }
 
 /**
- * Implementation of hook_block().
+ * Implements hook_block_info().
  */
-function feedburner_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-    case 'list':
-      return feedburner_block_list();
-    case 'configure':
-      return feedburner_block_configure($delta);
-    case 'save':
-      return feedburner_block_save($delta, $edit);
-    case 'view':
-      return feedburner_block_view($delta);
-  }
-}
+function feedburner_block_info() {
+  $blocks = array();
+
+  $blocks['feedflare'] = array(
+    'info' => t('FeedBurner FeedFlare'),
+    'cache' => DRUPAL_CACHE_PER_ROLE | DRUPAL_CACHE_PER_PAGE,
+  );
+  $blocks['feedburner_email_subscribe'] = array(
+    'info' => t('FeedBurner E-mail Subscribe'),
+    'cache' => DRUPAL_CACHE_GLOBAL,
+  );
+  $blocks['feedburner_feedcount'] = array(
+    'info' => t('FeedBurner FeedCount'),
+    'cache' => DRUPAL_CACHE_GLOBAL,
+  );
+  $blocks['feedburner_feeds'] = array(
+    'info' => t('FeedBurner Feeds'),
+    'cache' => DRUPAL_CACHE_GLOBAL,
+  );
 
-/**
- * Implementation of hook_block_list().
- */
-function feedburner_block_list() {
-  $blocks[0]['info'] = t('FeedBurner FeedFlare');
-  $blocks[0]['cache'] = BLOCK_CACHE_PER_ROLE | BLOCK_CACHE_PER_PAGE;
-  $blocks[1]['info'] = t('FeedBurner E-mail Subscribe');
-  $blocks[1]['cache'] = BLOCK_CACHE_GLOBAL;
-  $blocks[2]['info'] = t('FeedBurner FeedCount');
-  $blocks[2]['cache'] = BLOCK_CACHE_GLOBAL;
-  $blocks[3]['info'] = t('FeedBurner Feeds');
-  $blocks[3]['cache'] = BLOCK_CACHE_GLOBAL;
   return $blocks;
 }
 
 /**
- * Implementation of hook_block_configure().
+ * Implements hook_block_configure().
  */
 function feedburner_block_configure($delta = 0) {
   if ($delta == 1) {
@@ -383,7 +363,7 @@ function feedburner_block_configure($delta = 0) {
       '#default_value' => feedburner_var('block_email_feed'),
       '#options' => $feeds,
     );
-    /*$form['display'] = array(
+    /* $form['display'] = array(
       '#type' => 'radios',
       '#title' => t('Display as'),
       '#default_value' => feedburner_var('block_email_display'),
@@ -405,7 +385,7 @@ function feedburner_block_configure($delta = 0) {
 }
 
 /**
- * Implementation of hook_block_save().
+ * Implements hook_block_save().
  */
 function feedburner_block_save($delta = 0, $edit = array()) {
   if ($delta == 1) {
@@ -423,7 +403,7 @@ function feedburner_block_save($delta = 0, $edit = array()) {
 }
 
 /**
- * Implementation of hook_block_view().
+ * Implementshook_block_view().
  */
 function feedburner_block_view($delta = 0) {
   $block = array();
@@ -465,7 +445,7 @@ function feedburner_block_view($delta = 0) {
  */
 function feedburner_check_redirect($path) {
   // Do not waste time and database hits on certain paths (admin paths, frontpage, node page)
-  if (drupal_is_front_page() || preg_match('/^admin\/?|^node\/\d+\/?$/i', $path)) {
+  if (_feedburner_drupal_is_front_page() || preg_match('/^admin\/?|^node\/\d+\/?$/i', $path)) {
     return;
   }
 
@@ -483,7 +463,7 @@ function feedburner_check_redirect($path) {
     // user and not continue any more Drupal loading.
     //module_invoke_all('exit', $url);
     //session_write_close();
-    header('Location: '. $url, TRUE, (int) $status);
+    header('Location: ' . $url, TRUE, (int) $status);
     exit();
   }
 }
@@ -518,16 +498,18 @@ function feedburner_save($edit) {
  *   An object with the FeedBurner feed.
  */
 function feedburner_load($where, $args = array()) {
-  foreach ($where as $key => $value) {
-    if (is_string($key)) {
-      $args[] = $value;
-      $where[$key] = $key .' = '. (is_numeric($value) ? '%d' : "'%s'");
+  if ($where) {
+    $query = db_select('feedburner', 'f');
+    foreach ($where as $key => $value) {
+      $query->condition($key, $value);
     }
-  }
+    $found = $query
+      ->fields('f')
+      ->range(NULL, 1)
+      ->execute()
+      ->fetch();
 
-  if ($where && $args) {
-    $sql = "SELECT * FROM {feedburner} WHERE ". implode(' AND ', $where);
-    return db_fetch_object(db_query_range($sql, $args, 0, 1));
+    return $found;
   }
 }
 
@@ -543,12 +525,12 @@ function feedburner_delete($where, $args = array()) {
   foreach ($where as $key => $value) {
     if (is_string($value)) {
       $args[] = $value;
-      $where[$key] = $key .' = '. (is_numeric($value) ? '%d' : "'%s'");
+      $where[$key] = $key . ' = ' . (is_numeric($value) ? '%d' : "'%s'");
     }
   }
 
   if ($where && $args) {
-    return db_query("DELETE FROM {feedburner} WHERE ". implode(' AND ', $where), $args);
+    return db_query("DELETE FROM {feedburner} WHERE " . implode(' AND ', $where), $args);
   }
 }
 
@@ -569,7 +551,7 @@ function _feedburner_validate_feed($element, &$form_state) {
  * @return
  *   TRUE if replacements were made and the HTML was changed, FALSE otherwise.
  */
-/*function _feedburner_replace_feed_html(&$source) {
+/* function _feedburner_replace_feed_html(&$source) {
   $changed = FALSE;
 
   $query = db_query("SELECT path, feedburner FROM {feedburner} ORDER BY path DESC");
@@ -597,7 +579,7 @@ function _feedburner_validate_feed($element, &$form_state) {
  *   The full URL of the FeedBurner feed.
  */
 function _feedburner_construct_url($uri = '') {
-  return 'http://'. feedburner_var('domain') .'/'. $uri;
+  return 'http://' . feedburner_var('domain') . '/' . $uri;
 }
 
 /**
@@ -667,7 +649,7 @@ function _feedburner_get_feedflare_script($node) {
   $feedflare_feed = feedburner_var('feedflare_feed');
   $feedflare_node_types = feedburner_var('feedflare_node_types');
   if ($feedflare_feed && in_array($node->type, $feedflare_node_types)) {
-    return '<script src="'. _feedburner_construct_url('~s/'. $feedflare_feed) .'/?i='. url('node/'. $node->nid, array('absolute' => TRUE)) .'" type="text/javascript" charset="utf-8"></script>';
+    return '<script src="' . _feedburner_construct_url('~s/' . $feedflare_feed) . '/?i=' . url('node/' . $node->nid, array('absolute' => TRUE)) . '" type="text/javascript" charset="utf-8"></script>';
   }
   return FALSE;
 }
@@ -706,7 +688,7 @@ function feedburner_var($name, $default = NULL) {
     $defaults = feedburner_variables();
   }
 
-  $name = 'feedburner_'. $name;
+  $name = 'feedburner_' . $name;
 
   if (!isset($defaults[$name])) {
     trigger_error(t('Default variable for %variable not found.', array('%variable' => $name)));
@@ -714,3 +696,23 @@ function feedburner_var($name, $default = NULL) {
 
   return variable_get($name, isset($default) || !isset($defaults[$name]) ? $default : $defaults[$name]);
 }
+
+/**
+ * Workaround of drupal_is_front_page() function undefined error
+ */
+function _feedburner_drupal_is_front_page() {
+  // Use the advanced drupal_static() pattern, since this is called very often.
+  static $drupal_static_fast;
+  if (!isset($drupal_static_fast)) {
+    $drupal_static_fast['is_front_page'] = &drupal_static(__FUNCTION__);
+  }
+  $is_front_page = &$drupal_static_fast['is_front_page'];
+
+  if (!isset($is_front_page)) {
+    // As drupal_path_initialize updates $_GET['q'] with the 'site_frontpage' path,
+    // we can check it against the 'site_frontpage' variable.
+    $is_front_page = ($_GET['q'] == variable_get('site_frontpage', 'node'));
+  }
+
+  return $is_front_page;
+}
\ No newline at end of file
diff --git a/feedburner.pages.inc b/feedburner.pages.inc
index 11f470e..fa7d602 100644
--- a/feedburner.pages.inc
+++ b/feedburner.pages.inc
@@ -15,8 +15,8 @@ function feedburner_feedflare($feedflare) {
         $node = node_load($_GET['nid']);
         if (isset($node->comment) && $node->comment != COMMENT_NODE_DISABLED) {
           $output .= "<FeedFlare>\n";
-          $output .= "  <Text>". format_plural($node->comment_count, '@count comment', '@count comments') ."</Text>\n";
-          $output .= "  <Link href=\"". url('node/'. $node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) ."\" />\n";
+          $output .= "  <Text>" . format_plural($node->comment_count, '@count comment', '@count comments') . "</Text>\n";
+          $output .= "  <Link href=\"" . url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) . "\" />\n";
           $output .= "</FeedFlare>\n";
         }
       }
@@ -28,12 +28,12 @@ function feedburner_feedflare($feedflare) {
         $output .= "    <Link href=\"http://drupal.org/project/feedburner\" />\n";
         $output .= "    <Author>Dave Reid</Author>\n";
         $output .= "  </Catalog>\n";
-        $output .= "  <DynamicFlare href=\"". url('feedburner/feedflare/comments', array('absolute' => TRUE, 'query' => "nid=\${fn:substring-before(a:id, ' ')}")) ."\" />\n";
+        $output .= "  <DynamicFlare href=\"" . url('feedburner/feedflare/comments', array('absolute' => TRUE, 'query' => "nid=\${fn:substring-before(a:id, ' ')}")) . "\" />\n";
         $output .= "</FeedFlareUnit>\n";
       }
   }
 
-  drupal_set_header('Content-Type: application/xml; charset=utf-8');
+  drupal_add_http_header('Content-Type', 'application/xml; charset=utf-8');
   print $output;
 }
 
@@ -43,28 +43,28 @@ function feedburner_feedflare($feedflare) {
  * @todo Convert to Form API?
  */
 function theme_feedburner_block_email($feed) {
-  $output = '<form id="feedburner-block-email-form" action="http://feedburner.google.com/fb/a/mailverify" method="post" target="popupwindow" onsubmit="window.open(\'http://feedburner.google.com/fb/a/mailverify?uri='. $feed .'\', \'popupwindow\', \'scrollbars=yes,width=550,height=520\');return true">';
+  $output = '<form id="feedburner-block-email-form" action="http://feedburner.google.com/fb/a/mailverify" method="post" target="popupwindow" onsubmit="window.open(\'http://feedburner.google.com/fb/a/mailverify?uri=' . $feed . '\', \'popupwindow\', \'scrollbars=yes,width=550,height=520\');return true">';
   $output .= '<div class="container-inline" id="feedburner-block-email">';
   $output .= '<div class="form-item">';
-  $output .= '<label for="feedburner-block-email-form-email">'. t('Enter your email address:') .'</label>';
+  $output .= '<label for="feedburner-block-email-form-email">' . t('Enter your email address:') . '</label>';
   $output .= '<input type="text" name="email" id="feedburner-block-email-form-email" />';
   $output .= '</div>';
-  $output .= '<input type="hidden" value="'. $feed .'" name="uri"/>';
+  $output .= '<input type="hidden" value="' . $feed . '" name="uri"/>';
   $output .= '<input type="hidden" name="loc" value="en_US"/>';
-  $output .= '<input type="submit" value="'. t('Subscribe') .'" />';
-  $output .= '<p>'. t("Delivered by <a href=\"@link\">FeedBurner</a>", array('@link' => url('http://feedburner.google.com'))) .'</p>';
+  $output .= '<input type="submit" value="' . t('Subscribe') . '" />';
+  $output .= '<p>' . t("Delivered by <a href=\"@link\">FeedBurner</a>", array('@link' => url('http://feedburner.google.com'))) . '</p>';
   $output .= '</div>';
   $output .= '</form>';
   return $output;
 
-  // $output = l(t('Subscribe by E-mail'), "http://feedburner.google.com/fb/a/mailverify?uri='. $feed .'&amp;loc=en_US");
+  // $output = l(t('Subscribe by E-mail'), "http://feedburner.google.com/fb/a/mailverify?uri=' . $feed . '&amp;loc=en_US");
 }
 
 /**
  * Theme function for feed count block.
  */
 function theme_feedburner_block_feedcount($feed) {
-  $image = theme_image(_feedburner_construct_url('~fc/'. $feed .'?bg=99CCFF&fg=444444&anim=0'), '', '', array('width' => 88, 'height' => 26), FALSE);
+  $image = theme_image(_feedburner_construct_url('~fc/' . $feed . '?bg=99CCFF&fg=444444&anim=0'), '', '', array('width' => 88, 'height' => 26), FALSE);
   return l($image, _feedburner_construct_url($feed), array('html' => TRUE));
 }
 
@@ -78,7 +78,7 @@ function theme_feedburner_block_feeds() {
   $query = db_query("SELECT path, feedburner FROM {feedburner}");
   while ($feed = db_fetch_object($query)) {
     $features = _feedburner_get_feed_features($feed->feedburner);
-    $items[] = theme('image', 'misc/feed.png') .' '. l(($features->title ? $features->title : $feed->path), _feedburner_construct_url($feed->feedburner));
+    $items[] = theme('image', 'misc/feed.png') . ' ' . l(($features->title ? $features->title : $feed->path), _feedburner_construct_url($feed->feedburner));
   }
 
   return theme('item_list', $items);
diff --git a/feedburner.test b/feedburner.test
index 2573dfe..37b6e0f 100644
--- a/feedburner.test
+++ b/feedburner.test
@@ -78,9 +78,9 @@ class FeedBurnerTestCase extends DrupalWebTestCase {
    * Test user blog feed redirection.
    */
   function testBlogFeedRedirection() {
-    $blog_user = $this->drupalCreateUser(array('create blog entries', 'add FeedBurner feed to own blog'));
-    $blog_user_feed = 'blog/'. $blog_user->uid . '/feed';
-    $blog_user_edit = 'user/'. $blog_user->uid . '/edit';
+    $blog_user = $this->drupalCreateUser(array('create blog entries', 'add feedburner feed to own blog'));
+    $blog_user_feed = 'blog/' . $blog_user->uid . '/feed';
+    $blog_user_edit = 'user/' . $blog_user->uid . '/edit';
 
     $this->drupalLogin($blog_user);
 
@@ -108,9 +108,9 @@ class FeedBurnerTestCase extends DrupalWebTestCase {
     $this->assertNotRedirected($blog_user_feed, t('Blog feed not redirected.'));
 
     // Test that a user without permission cannot access the form field.
-    $no_blog_user = $this->drupalCreateUser(array('add FeedBurner feed to own blog'));
+    $no_blog_user = $this->drupalCreateUser(array('add feedburner feed to own blog'));
     $this->drupalLogin($no_blog_user);
-    $this->drupalGet('user/'. $no_blog_user->uid . '/edit');
+    $this->drupalGet('user/' . $no_blog_user->uid . '/edit');
     $this->assertNoFieldByName('feedburner_feedburner');
   }
 
@@ -120,7 +120,7 @@ class FeedBurnerTestCase extends DrupalWebTestCase {
   function testFeedHTMLReplacement() {
     $original_url = url('rss.xml');
     $feedburner_url = _feedburner_construct_url('example-feed');
-    
+
     // Enable a FeedBurner feed and check the proper original HTML is found.
     feedburner_save(array('path' => 'rss.xml', 'feedburner' => 'example-feed'));
     $this->drupalGet('');