FEAT: minor code optimization.