fixing more code layout