Fix white space and quotes