servlet and injection refactoring