Renamed prices to quotes, and other cleanup