Bango Servlet refactor