[TASK] Doc comment and debug message minor changes