Refactor more examples into context