Refactor

Refactor, mostly variable names. The code used "desc" for descriptors, although sometimes these were called "descriptions".