Cleaning code layout