diff --git a/examples/deep_linking.py b/examples/deep_linking.py
index 601eccb..f92680f 100644
--- a/examples/deep_linking.py
+++ b/examples/deep_linking.py
@@ -68,6 +68,3 @@ def send_welcome(message):
     bot.reply_to(message, reply)
 
 bot.polling()
-
-while True:
-    time.sleep(0)
\ No newline at end of file
diff --git a/examples/detailed_example/detailed_example.py b/examples/detailed_example/detailed_example.py
index 8b2b4ce..bf5f632 100644
--- a/examples/detailed_example/detailed_example.py
+++ b/examples/detailed_example/detailed_example.py
@@ -8,127 +8,124 @@ import time
 
 TOKEN = '<token_string>'
 
-knownUsers = [] #todo: save these in a file, 
-userStep = {}   #      so they won't reset every time the bot restarts
+knownUsers = []  # todo: save these in a file,
+userStep = {}  # so they won't reset every time the bot restarts
 
-commands={ #command description used in the "help" command
-'start': 'Get used to the bot', 
-'help': 'Gives you information about the available commands', 
-'sendLongText': 'A test using the \'send_chat_action\' command',
-'getImage': 'A test using multi-stage messages, custom keyboard, and media sending'
+commands = {  # command description used in the "help" command
+              'start': 'Get used to the bot',
+              'help': 'Gives you information about the available commands',
+              'sendLongText': 'A test using the \'send_chat_action\' command',
+              'getImage': 'A test using multi-stage messages, custom keyboard, and media sending'
 }
 
-imageSelect = types.ReplyKeyboardMarkup(one_time_keyboard=True) #create the image selection keyboard
+imageSelect = types.ReplyKeyboardMarkup(one_time_keyboard=True)  # create the image selection keyboard
 imageSelect.add('cock', 'pussy')
 
-hideBoard = types.ReplyKeyboardHide()	#if sent as reply_markup, will hide the keyboard
+hideBoard = types.ReplyKeyboardHide()  # if sent as reply_markup, will hide the keyboard
 
-#error handling if user isn't known yet 
-#(obsolete once known users are saved to file, because all users 
+
+# error handling if user isn't known yet
+# (obsolete once known users are saved to file, because all users
 #   had to use the /start command and are therefore known to the bot)
-def getUserStep(uid): 
-	if uid in userStep:
-		return userStep[uid]
-	else: 
-		knownUsers.append(uid)
-		userStep[uid] = 0
-		print "New user detected, who hasn't used \"/start\" yet"
-		return 0
+def get_user_step(uid):
+    if uid in userStep:
+        return userStep[uid]
+    else:
+        knownUsers.append(uid)
+        userStep[uid] = 0
+        print "New user detected, who hasn't used \"/start\" yet"
+        return 0
 
 
-#only used for console output now
+# only used for console output now
 def listener(messages):
-	"""
-	When new messages arrive TeleBot will call this function.
-	"""
-	for m in messages:
-		cid = m.chat.id
-		if m.content_type == 'text':
-			#print the sent message to the console
-			print str(m.chat.first_name) + " [" + str(m.chat.id) + "]: " + m.text 
+    """
+    When new messages arrive TeleBot will call this function.
+    """
+    for m in messages:
+        if m.content_type == 'text':
+            # print the sent message to the console
+            print str(m.chat.first_name) + " [" + str(m.chat.id) + "]: " + m.text
+
 
 bot = telebot.TeleBot(TOKEN)
-bot.set_update_listener(listener) #register listener
-try:
-	bot.polling()
-except Exception:
-	pass
+bot.set_update_listener(listener)  # register listener
 
-	
-#handle the "/start" command
+
+# handle the "/start" command
 @bot.message_handler(commands=['start'])
 def command_start(m):
-	cid = m.chat.id
-	if not cid in knownUsers: #if user hasn't used the "/start" command yet:
-		knownUsers.append(cid)  #save user id, so you could brodcast messages to all users of this bot later
-		userStep[cid] = 0       #save user id and his current "command level", so he can use the "/getImage" command
-		bot.send_message(cid, "Hello, stranger, let me scan you...")
-		bot.send_message(cid, "Scanning complete, I know you now")
-		command_help(m)         #show the new user the help page
-	else:
-		bot.send_message(cid, "I already know you, no need for me to scan you again!")
-		
+    cid = m.chat.id
+    if cid not in knownUsers:  # if user hasn't used the "/start" command yet:
+        knownUsers.append(cid)  # save user id, so you could brodcast messages to all users of this bot later
+        userStep[cid] = 0  # save user id and his current "command level", so he can use the "/getImage" command
+        bot.send_message(cid, "Hello, stranger, let me scan you...")
+        bot.send_message(cid, "Scanning complete, I know you now")
+        command_help(m)  # show the new user the help page
+    else:
+        bot.send_message(cid, "I already know you, no need for me to scan you again!")
 
-#help page
-@bot.message_handler(commands=['help']) 
+
+# help page
+@bot.message_handler(commands=['help'])
 def command_help(m):
-	cid = m.chat.id
-	helpText = "The following commands are available: \n"
-	for key in commands:                  #generate help text out of the commands dictionary defined at the top
-		helpText += "/" + key + ": "
-		helpText += commands[key] + "\n"
-	bot.send_message(cid, helpText)       #send the generated help page
+    cid = m.chat.id
+    help_text = "The following commands are available: \n"
+    for key in commands:  # generate help text out of the commands dictionary defined at the top
+        help_text += "/" + key + ": "
+        help_text += commands[key] + "\n"
+    bot.send_message(cid, help_text)  # send the generated help page
 
 
-#chat_action example (not a good one...)	
-@bot.message_handler(commands=['sendLongText'])  
-def command_longText(m):
-	cid = m.chat.id
-	bot.send_message(cid, "If you think so...")
-	bot.send_chat_action(cid, 'typing')            #show the bot "typing" (max. 5 secs)
-	time.sleep(3)
-	bot.send_message(cid,".")
+# chat_action example (not a good one...)
+@bot.message_handler(commands=['sendLongText'])
+def command_long_text(m):
+    cid = m.chat.id
+    bot.send_message(cid, "If you think so...")
+    bot.send_chat_action(cid, 'typing')  # show the bot "typing" (max. 5 secs)
+    time.sleep(3)
+    bot.send_message(cid, ".")
 
 
-#user can chose an image (multi-stage command example)
-@bot.message_handler(commands=['getImage']) 
+# user can chose an image (multi-stage command example)
+@bot.message_handler(commands=['getImage'])
 def command_image(m):
-	cid = m.chat.id
-	bot.send_message(cid, "Please choose your image now", reply_markup=imageSelect) #show the keyboard
-	userStep[cid] = 1 #set the user to the next step (expecting a reply in the listener now)
+    cid = m.chat.id
+    bot.send_message(cid, "Please choose your image now", reply_markup=imageSelect)  # show the keyboard
+    userStep[cid] = 1  # set the user to the next step (expecting a reply in the listener now)
 
-	
-#if the user has issued the "/getImage" command, process the answer
-@bot.message_handler(func=lambda message: getUserStep(message.chat.id) == 1) 
-def msg_imageSelect(m):
-	cid = m.chat.id
-	text = m.text
-	bot.send_chat_action(cid, 'typing') #for some reason the 'upload_photo' status isn't quite working (doesn't show at all)
-	
-	if text == "cock":                                  #send the appropriate image based on the reply to the "/getImage" command
-		bot.send_photo(cid, open('rooster.jpg', 'rb'), reply_markup=hideBoard) #send file and hide keyboard, after image is sent
-		userStep[cid]=0   #reset the users step back to 0
-	elif text == "pussy":
-		bot.send_photo(cid, open('kitten.jpg', 'rb'), reply_markup=hideBoard)
-		userStep[cid]=0
-	else:
-		bot.send_message(cid, "Don't type bullsh*t, if I give you a predefined keyboard!")
-		bot.send_message(cid, "Please try again")
 
-		
-#filter on a specific message		
-@bot.message_handler(func=lambda message: message.text=="hi") 
-def command_textHi(m):
-	bot.send_message(m.chat.id, "I love you too!")
+# if the user has issued the "/getImage" command, process the answer
+@bot.message_handler(func=lambda message: get_user_step(message.chat.id) == 1)
+def msg_image_select(m):
+    cid = m.chat.id
+    text = m.text
 
-#default handler for every other text	
+    # for some reason the 'upload_photo' status isn't quite working (doesn't show at all)
+    bot.send_chat_action(cid, 'typing')
+
+    if text == "cock":  # send the appropriate image based on the reply to the "/getImage" command
+        bot.send_photo(cid, open('rooster.jpg', 'rb'),
+                       reply_markup=hideBoard)  # send file and hide keyboard, after image is sent
+        userStep[cid] = 0  # reset the users step back to 0
+    elif text == "pussy":
+        bot.send_photo(cid, open('kitten.jpg', 'rb'), reply_markup=hideBoard)
+        userStep[cid] = 0
+    else:
+        bot.send_message(cid, "Don't type bullsh*t, if I give you a predefined keyboard!")
+        bot.send_message(cid, "Please try again")
+
+
+# filter on a specific message
+@bot.message_handler(func=lambda message: message.text == "hi")
+def command_text_hi(m):
+    bot.send_message(m.chat.id, "I love you too!")
+
+
+# default handler for every other text
 @bot.message_handler(func=lambda message: True, content_types=['text'])
 def command_default(m):
-	bot.send_message(m.chat.id, "I don't understand \""+m.text+"\"\nMaybe try the help page at /help") #this is the standard reply to a normal message
-	
-	
-while True: # Don't let the main Thread end.
-	try:
-		time.sleep(1)
-	except KeyboardInterrupt:
-		break
+    # this is the standard reply to a normal message
+    bot.send_message(m.chat.id, "I don't understand \"" + m.text + "\"\nMaybe try the help page at /help")
+
+bot.polling()
diff --git a/examples/echo_bot.py b/examples/echo_bot.py
index 4d0aebc..f88d3bf 100644
--- a/examples/echo_bot.py
+++ b/examples/echo_bot.py
@@ -7,7 +7,6 @@ API_TOKEN = '<api_token>'
 
 bot = telebot.TeleBot(API_TOKEN)
 
-
 # Handle '/start' and '/help'
 @bot.message_handler(commands=['help', 'start'])
 def send_welcome(message):
@@ -23,6 +22,3 @@ def echo_message(message):
     bot.reply_to(message, message.text)
 
 bot.polling()
-
-while True:
-    pass
diff --git a/examples/step_example.py b/examples/step_example.py
index 6e1dbdd..fd8d07d 100644
--- a/examples/step_example.py
+++ b/examples/step_example.py
@@ -76,7 +76,3 @@ def process_sex_step(message):
 
 
 bot.polling()
-
-while True:
-    time.sleep(1)
-    pass