cleaning + refactoring + adding quoteController