Refactor for more granular partials.