cleaning code layout