Improved the quotes. Removed QuoteListener