Add targets and remove trailing commas