Clean up and update examples