875: just arrange code