Fixed Trailing Comma Issue