Refactoring of examples in progress