Add jq prefix to class names; clean up