Remove trailing spaces and use double quotes