Updates some of the examples to reflect current best practices.