Efficiency and quote updates

Just some updates for code efficiency and quotes.