Remove trailing commas
Prefer single quotes