renaming and commenting factor rule