Remove extra comma and underscores