Cleanup, trailing comma