Such refactoring, very clean