removed trailing commas, I'll get it right eventually