Update jsml calls and collapse end brackets for brevity