Slight refactoring of partials