diff --git a/socialfeed.module b/socialfeed.module
index 296099f..26104a8 100644
--- a/socialfeed.module
+++ b/socialfeed.module
@@ -114,17 +114,17 @@ function socialfeed_block_view($delta = '') {
   switch ($delta) {
     case 'facebook_latest_feed':
       $block['subject'] = '';
-      $block['content'] = socialfeed_facebook_posts();
+      $block['content'] = socialfeed_posts_render('facebook');
       break;
 
     case 'twitter_latest_feed':
       $block['subject'] = '';
-      $block['content'] = socialfeed_twitter_posts();
+      $block['content'] = socialfeed_posts_render('twitter');
       break;
 
     case 'instagram_latest_feed':
       $block['subject'] = '';
-      $block['content'] = socialfeed_instagram_posts();
+      $block['content'] = socialfeed_posts_render('instagram');
       break;
   }
 
@@ -132,6 +132,20 @@ function socialfeed_block_view($delta = '') {
 }
 
 /**
+ * Return HTML with posts.
+ *
+ * @param $provider
+ *
+ * @return string
+ * @throws \Exception
+ */
+function socialfeed_posts_render($provider) {
+  $fn = 'socialfeed_'.$provider.'_posts';
+  $message_feed = call_user_func($fn);
+  return theme('socialfeed_'.$provider, array($provider => $message_feed));
+}
+
+/**
  * Returns HTML with feeds in required format.
  *
  * @param string $page_name
@@ -221,7 +235,7 @@ function socialfeed_facebook_feeds($page_name = '') {
         }
       }
 
-      return theme('socialfeed_facebook', array('facebook' => $message_feed));
+      return $message_feed;
     }
     else {
       drupal_set_message(t('The access_token provided is invalid.'), 'error');
@@ -427,11 +441,12 @@ function socialfeed_twitter_posts() {
         );
       }
     }
-    return theme('socialfeed_twitter', array('twitter' => $twitter_tweets));
-  }
-  else {
-    drupal_set_message(t('Please provide your Twitter credentials <a href="@twitter">here</a>.', array('@twitter' => url('admin/config/services/socialfeed/twitter'))), 'warning');
+    return $twitter_tweets;
   }
+  drupal_set_message(t('Please provide your Twitter credentials <a href="@twitter">here</a>.', array('@twitter' => url('admin/config/services/socialfeed/twitter'))), 'warning');
+
+  return array();
+
 }
 
 /**
@@ -501,7 +516,7 @@ function socialfeed_instagram_posts() {
       foreach ($pic as $key => $image) {
         $images[$key]['image_url'] = $image[$resolution]['url'];
       }
-      return theme('socialfeed_instagram', array('instagram_images' => $images));
+      return $images;
     }
     else {
       drupal_set_message(t('The access_token provided is invalid.'), 'error');