Refactor, more examples.