More comments [skip ci]