Clean up example
Significant cleanup