Refactor two more processing servlets