Price Range refactor