Cleanup and add simple example