Refacto using partials