refactored jsp