fix whitespace and strings