cleaned up jw and ISP references