Several docstrings added and commented out code removed