diff --git a/active_bots/telegrambot.py b/active_bots/telegrambot.py
index 4534047..f343ea9 100644
--- a/active_bots/telegrambot.py
+++ b/active_bots/telegrambot.py
@@ -15,17 +15,22 @@ class TelegramBot(Bot):
         for update in updates:
             if update.message.text.lower() == "/start":
                 user.add_telegram_subscribers(update.message.from.id)
-                tb.send_message(update.message.from.id, "You are now subscribed to report notifications.") #TODO: /start message should be set in frontend
+                tb.send_message(update.message.from.id, "You are now \
+                        subscribed to report notifications.") 
+                #TODO: /start message should be set in frontend
             elif update.message.text.lower() == "/stop":
                 user.remove_telegram_subscribers(update.message.from.id)
-                tb.send_message(update.message.from.id, "You are now unsubscribed from report notifications.") #TODO: /stop message should be set in frontend
+                tb.send_message(update.message.from.id, "You are now \
+                        unsubscribed from report notifications.") 
+                #TODO: /stop message should be set in frontend
             elif update.message.text.lower() == "/help":
-                tb.send_message(update.message.from.id, "Send reports here to share them with other users. Use /start and /stop to be included/excluded.") #TODO: /help message should be set in frontend
+                tb.send_message(update.message.from.id, "Send reports here to \
+                        share them with other users. Use /start and /stop to \
+                        be included/excluded.") 
+                #TODO: /help message should be set in frontend
             else:
-                for row in user.get_telegram_subscribers():
-                    if update.message.from.id == row[0]:
-                        reports.append(Report(update.message.from.username, self, update.message.text, None, update.message.date))
-                        break
+                reports.append(Report(update.message.from.username,self,
+                               update.message.text,None,update.message.date))
         return reports
 
     def post(self, user, report):