variables refactoring