fix double quotes and redundant self