code layout further updates