Improving code layout