Fix whitespace and use double quotes