Clean up the code, clean up the example