Update docstrings and remove some comments