Some minor code layout changes