refactor MVP examples