Added support for quotes and more cleaning.