Refactor by adding partials.