minor code layout changes