Refactor to partials.