Refactor examples