Better code layout