diff --git a/bin/caesar_cipher.py b/bin/caesar_cipher.py
index 3c4f722..d18271d 100644
--- a/bin/caesar_cipher.py
+++ b/bin/caesar_cipher.py
@@ -29,16 +29,14 @@ def decrypt(n, ciphertext):
     return result
 
 
-print("Encrypt or decrypt?")
-ans = input()
+print("***** CAESAR CIPHER *****")
+ans = input("Encrypt or Decrypt ? ")
 ans = ans.lower()
-print("Enter message")
-k = input()
-print("Enter rotation number")
-nn = int(input())
+k = input("Enter message : ")
+nn = int(input("Enter number of rotation : "))
 if ans == 'encrypt':
     ret = encrypt(nn, k)
-    print('Encrytped: %s' % ret)
+    print('Encrytped message: %s' % ret)
 else:
     ret = decrypt(nn, k)
-    print('Decrytped: %s' % ret)
+    print('Decrytped message: %s' % ret)
diff --git a/bin/end_to_end.py b/bin/end_to_end.py
index b3a3ea0..325978e 100644
--- a/bin/end_to_end.py
+++ b/bin/end_to_end.py
@@ -7,7 +7,10 @@ def encrypt(msg):
     off = 3
     enc = ""
     for i in msg:
-        enc = enc + (a[(a.index(i)+off) % 26])
+        try:
+            enc = enc + a[int((a.index(i)+off)) % 26]
+        except ValueError:
+            enc += i
     return enc
 
 
@@ -15,30 +18,36 @@ def decrypt(msg):
     off = 3
     dec = ""
     for i in msg:
-        dec = dec + (a[(a.index(i)-off) % 26])
+        try:
+            dec = dec + a[int((a.index(i)-off)) % 26]
+        except ValueError:
+            dec += i
     return dec
 
 
 # Client Side(Sender)
-msg = input("Enter Message To Send: ")
-f = open('server.txt', 'w+')
-print("Encrypting..........")
-time.sleep(2)
-enc = encrypt(msg)
-print("Message Sent Is: ", enc)
+print("***** END-TO-END ENCRYPTION *****")
+msg = input("Enter message to send : ")
+print()
+print("Encrypting...")
+enc = encrypt(msg.lower())
+print("Message sent is       : %s " % enc)
 
 # Server Side
+time.sleep(2)
+f = open('server.txt', 'w+')
 f.write(enc)
 f.close()
 
+# Client Side(Receiver)
 print()
-# Client Side(Reciever)
-print("Reciever Is Recieving.........")
+print("Receiving message...")
 time.sleep(2)
 f = open('server.txt', 'r+')
 msg = f.read()
-print("Message Recieved Is: ", msg)
-print("Decrypting........")
+print("Message received is   : %s " % msg)
+print()
+print("Decrypting...")
 time.sleep(2)
 dec = decrypt(msg)
-print("Message Displayed Is: ", dec)
+print("Decrypted message     : %s " % dec)
diff --git a/bin/server.txt b/bin/server.txt
index 32eab29..be92aa2 100644
--- a/bin/server.txt
+++ b/bin/server.txt
@@ -1 +1 @@
-dddvdvkegivmk
\ No newline at end of file
+krpherbc udglr
\ No newline at end of file