Starting to clean up example.