Small code layout changes