Flatten code layout a bit