Refactored quotes into objects