Refactoring prices and matchprices