diff --git a/functions/handlers/users.js b/functions/handlers/users.js
index 2a83ee7..c4ceba4 100644
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -134,9 +134,6 @@ exports.login = (req, res) => {
     };
 
 exports.getProfileInfo = (req, res) => {
-    // FIXME: Delete this after login is implemented
-    req.user = {};
-    req.user.handle = 'itsjimmy';
 
     db.collection('users').doc(req.user.handle).get()
         .then((data) => {
@@ -149,12 +146,7 @@ exports.getProfileInfo = (req, res) => {
 };
 
 exports.updateProfileInfo = (req, res) => {
-    // FIXME: Delete this after login is implemented
-    req.user = {};
-    req.user.handle = 'itsjimmy';
-
     // TODO: Add functionality for adding/updating profile images
-
     
     // Data validation
     const {valid, errors, profileData} = validateUpdateProfileInfo(req.body);
diff --git a/functions/index.js b/functions/index.js
index 04d3b4e..def41b9 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,25 +1,22 @@
 /* eslint-disable promise/always-return */
 const functions = require('firebase-functions');
 const app = require('express')();
+const fbAuth = require('./util/fbAuth');
+const {db} = require('./util/admin');
 const cors = require('cors');
 app.use(cors());
 
-const fbAuth = require('./util/fbAuth');
-
-
-const {db} = require('./util/admin');
-
-// const firebase = require('firebase');
-// firebase.initializeApp(config);
-
-
-
-
 
 /*------------------------------------------------------------------*
 *  handlers/users.js                                               *
 *------------------------------------------------------------------*/
-const {getUserDetails, getProfileInfo, updateProfileInfo, signup, login} = require('./handlers/users');
+const {
+    getUserDetails,
+    getProfileInfo,
+    login,
+    signup,
+    updateProfileInfo,
+} = require('./handlers/users');
 
 app.post('/signup', signup);
 
@@ -28,17 +25,19 @@ app.post('/login', login);
 app.get('/getUser/:handle', getUserDetails);
 
 // Returns all profile data of the currently logged in user
-// TODO: Add fbAuth
-app.get('/getProfileInfo', getProfileInfo);
+app.get('/getProfileInfo', fbAuth, getProfileInfo);
 
 // Updates the currently logged in user's profile information
-// TODO: Add fbAuth
-app.post('/updateProfileInfo', updateProfileInfo);
+app.post('/updateProfileInfo', fbAuth, updateProfileInfo);
+
 
 /*------------------------------------------------------------------*
  *  handlers/post.js                                                *
  *------------------------------------------------------------------*/
-const {putPost, getallPostsforUser} = require('./handlers/post');
+const {
+    getallPostsforUser,
+    putPost,
+} = require('./handlers/post');
 
 app.get('/getallPostsforUser', getallPostsforUser);