[Change] Minor comments and docstrings