Remove redundant comments, restructure docstrings