quote and whitespace cleanup