diff --git a/walkthroughs/week-4-libraries/authentication/examples/user-nicknames/src/main/java/com/google/sps/servlets/NicknameServlet.java b/walkthroughs/week-4-libraries/authentication/examples/user-nicknames/src/main/java/com/google/sps/servlets/NicknameServlet.java
index 07fadbc..10a5b30 100644
--- a/walkthroughs/week-4-libraries/authentication/examples/user-nicknames/src/main/java/com/google/sps/servlets/NicknameServlet.java
+++ b/walkthroughs/week-4-libraries/authentication/examples/user-nicknames/src/main/java/com/google/sps/servlets/NicknameServlet.java
@@ -30,6 +30,8 @@
 
 @WebServlet("/nickname")
 public class NicknameServlet extends HttpServlet {
+  private static final DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+  private static final UserService userService = UserServiceFactory.getUserService();
 
   @Override
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -37,7 +39,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     PrintWriter out = response.getWriter();
     out.println("<h1>Set Nickname</h1>");
 
-    UserService userService = UserServiceFactory.getUserService();
     if (userService.isUserLoggedIn()) {
       String nickname = getUserNickname(userService.getCurrentUser().getUserId());
       out.println("<p>Set your nickname here:</p>");
@@ -54,7 +55,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    UserService userService = UserServiceFactory.getUserService();
     if (!userService.isUserLoggedIn()) {
       response.sendRedirect("/nickname");
       return;
@@ -63,7 +63,6 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     String nickname = request.getParameter("nickname");
     String id = userService.getCurrentUser().getUserId();
 
-    DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
     Entity entity = new Entity("UserInfo", id);
     entity.setProperty("id", id);
     entity.setProperty("nickname", nickname);
@@ -76,8 +75,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
   /**
    * Returns the nickname of the user with id, or empty String if the user has not set a nickname.
    */
-  private String getUserNickname(String id) {
-    DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+  private static String getUserNickname(String id) {
     Query query =
         new Query("UserInfo")
             .setFilter(new Query.FilterPredicate("id", Query.FilterOperator.EQUAL, id));