cleanup.
Shorter desc
language cleanup
storage
merge