Refactor market place