Refactoring Prices (getting rid of matchprices)