More correct refactoring