Eliminating a redundant pair of lines.
Reorganizing classes a little (mostly auto-sorting) and cleaned up some documentation.