Added support for both single and double quotes.

Use more constants.