Fix whitespace and quotes