Code cleanup in DefaultServlet