Cleanup and start on better examples.