Fix unescaped single-quotes and some linting fixes