Refactored Servlet and Service