reordering and commenting