Changed to trailing comma style instead of comma-first