Cleanup and add example