Refactored quote calcultions