Removed unquotes and linted