- refact code