Fix extra comma and trailing whitespaces.