comments update for clarity and correctness