Refactor variable