Cleanup descriptions & update documentation