Finished TODOs in docstrings