[FIX] fix [CODE_REVIEW] comments