Improve comments for clarification or fix error