Refactored.
Refactored jsps.