added jquery and clean up