edited some format