Made the doc-block contents of the classes more uniform