Reworked comments