refactored jsp pages