cleaned up JSP