Reorganizing constants and commenting