Refactor partials