fixed code layout