Removed trailing spaces and extra commas