Refactor #price and #markup.