diff --git a/src/app/templates/login.html b/src/app/templates/login.html
index 595edc2..d9c225c 100644
--- a/src/app/templates/login.html
+++ b/src/app/templates/login.html
@@ -12,18 +12,13 @@ $def with (nav, login_form, friends)
     
     $:nav
 
-    <h3>Log In</h3>
-    <form method="POST">
-        $:login_form.render()
-    </form> 
+    $if not session.username:
+        <h3>Log In</h3>
+        <form method="POST">
+            $:login_form.render()
+        </form> 
 
-    $if session.username:
+    $else:
         <h1>Logged in as $session.username</h1>
 
-        <h3>Registered friends:</h3>
-            <ul>
-                $for user in friends:
-                    <li id="$user[0]">$user[1]</li>
-            </ul>
-
 </body>
\ No newline at end of file
diff --git a/src/app/views/login.py b/src/app/views/login.py
index dbb6fb3..6804aba 100644
--- a/src/app/views/login.py
+++ b/src/app/views/login.py
@@ -23,6 +23,7 @@ class Login():
         session = web.ctx.session
         username = ""
         sign = ""
+        
         # If the user selected 'remember me' they log in automatically
         try:
             # Fetch the users cookies if it exists
diff --git a/src/app/views/register.py b/src/app/views/register.py
index 2203497..e7ececa 100644
--- a/src/app/views/register.py
+++ b/src/app/views/register.py
@@ -24,33 +24,33 @@ class Register:
 
     def POST(self):
         """
-        Register new user in database
+        Handle input data and register new user in database
 
             :return: Main page
         """
         session = web.ctx.session
-
         nav = get_nav_bar(session)
-
         data = web.input()
-        
         message = ""
 
+        # Check if user exists
         if models.login.get_user_id_by_name(data.username):
             message += "Invalid user, already exists. "
 
+        # Check if email is valid
         if not re.match(r"[^@]+@[^@]+\.[^@]+", data.email):
             message += "Invalid email address. "
 
+        # Check if password is valid
         if not len(data.password) > 5:
             message += "Invalid password, must be atleast 6 characters long. "
 
+        # Register user if input is valid
         if len(message) == 0:
             models.register.set_user(data.username, hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), 
             data.full_name, data.email, data.company, data.phone_number, data.street_address, 
             data.city, data.state, data.postal_code, data.country)
             message += "User Registered. "
-
         
         return render.register(nav, register_form, message)