Cleanups. More class documentation.