Additional docstrings and comments