Refactored via adding a pattern/Strategy?/ to the servlets!