Allowed trailing commas and cleaned up code.