minor code layout