Refactor Market