cleaned up jsp a bit