Refactor  variable