Clean up and documentation for classes and tests