refactor shops