INFRA-132 - Comment format cleanup