Modify classes
Change docstrings