fix code layout2