Fix comment usability issues