Refactored into a better object-oriented representation of a quote