Reword docstring
Rearrange some classes; clean up wording