refactored some servlets