fixed trailing commas warnings