more refactoring into quote class