Dealt with trailing commas