Update and rename code to FormServlet