removed trailing commas as per convention