Allow strings to be single or double quoted
Remove redundant space definition
Expand IDENTIFIER to include css classes and ids