subject line
Refactored some comments

what happened

[ticket: X]