More variables refactoring