Refactor examples (heavily)