Fix spacing and use double quotes when possible