More docstrings added, some extraneous comments removed