[na] refactory