Refactoring partials