and removing trailing comma