Add unfoldr
Cleanup