Better code wrap