fa: minor code layout